serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-09 04:18:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Proxy: Instead of setting DisableKeepAlives, set MaxIdleConnsPerHost to -1 to prevent net/http from pooling the connections. DisableKeepAlives causes net/http to send a Connection: Closed header which is bad. Fixes #1056

Browse source
This commit is contained in:
Nimi Wariboko Jr 2016-08-22 17:58:43 -07:00
parent fdad616df7
commit 2ef8905966
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
caddyhttp/proxy/reverseproxy.go
View file

@ -304,7 +304,7 @@ func newConnHijackerTransport(base http.RoundTripper) *connHijackerTransport {
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
}).Dial, }).Dial,
TLSHandshakeTimeout: 10 * time.Second, TLSHandshakeTimeout: 10 * time.Second,
DisableKeepAlives: true, MaxIdleConnsPerHost: -1,
} }
if base != nil { if base != nil {
if baseTransport, ok := base.(*http.Transport); ok { if baseTransport, ok := base.(*http.Transport); ok {
@ -313,7 +313,7 @@ func newConnHijackerTransport(base http.RoundTripper) *connHijackerTransport {
transport.TLSHandshakeTimeout = baseTransport.TLSHandshakeTimeout transport.TLSHandshakeTimeout = baseTransport.TLSHandshakeTimeout
transport.Dial = baseTransport.Dial transport.Dial = baseTransport.Dial
transport.DialTLS = baseTransport.DialTLS transport.DialTLS = baseTransport.DialTLS
transport.DisableKeepAlives = true transport.MaxIdleConnsPerHost = -1
} }
} }
hjTransport := &connHijackerTransport{transport, nil, bufferPool.Get().([]byte)[:0]} hjTransport := &connHijackerTransport{transport, nil, bufferPool.Get().([]byte)[:0]}