4
0
mirror of https://github.com/cwinfo/matterbridge.git synced 2025-07-04 15:57:44 +00:00

Update go-nc-talk (nctalk) (#1333)

Signed-off-by: Gary Kim <gary@garykim.dev>
This commit is contained in:
Gary Kim
2020-12-10 07:06:27 +08:00
committed by GitHub
parent 0d7315249d
commit 41b4e64be9
10 changed files with 87 additions and 45 deletions

View File

@ -14,17 +14,18 @@ func (c *Client) buildRequest() (err error) {
return
}
c.transport = &http.Transport{}
c.applyHTTPHeader()
c.applyBasicAuth()
c.applyClient()
c.applyTimeout()
c.applyCookies()
// Apply transport needs to be called before TLSConfig as TLSConfig modifies
// the http transport
c.applyTransport()
c.applyTLSConfig()
err = c.applyProxy()
c.client.Transport = c.transport
c.client.Transport = c.Transport
return
}
@ -84,15 +85,20 @@ func (c *Client) applyProxy() (err error) {
if proxy, err = url.Parse(c.ProxyURL); err != nil {
return
} else if proxy != nil {
c.transport.Proxy = http.ProxyURL(proxy)
c.Transport.Proxy = http.ProxyURL(proxy)
}
}
return
}
func (c *Client) applyTLSConfig() {
// &tls.Config{InsecureSkipVerify: true}
if c.TLSConfig != nil {
c.transport.TLSClientConfig = c.TLSConfig
c.Transport.TLSClientConfig = c.TLSConfig
}
}
func (c *Client) applyTransport() {
if c.Transport == nil {
c.Transport = &http.Transport{}
}
}

View File

@ -39,12 +39,12 @@ type Client struct {
ContentType ContentType
Cookies []*http.Cookie
TLSConfig *tls.Config
Transport *http.Transport
// private
client *http.Client
requestURL requestURL
req *http.Request
transport *http.Transport
}
// BasicAuth Add Username:Password as Basic Auth