github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Follow on for 1.4 to default HTTP2 on by default"

Browse Source 
This reverts commit efe25553cd.
This commit is contained in:
Timothy St. Clair 2016-07-20 08:47:15 -05:00
parent ecebdb5707
commit 8cb799c789
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/util/net/http.go
View File

@ -77,10 +77,8 @@ func SetOldTransportDefaults(t *http.Transport) *http.Transport {
// for the Proxy, Dial, and TLSHandshakeTimeout fields if unset // for the Proxy, Dial, and TLSHandshakeTimeout fields if unset
func SetTransportDefaults(t *http.Transport) *http.Transport { func SetTransportDefaults(t *http.Transport) *http.Transport {
t = SetOldTransportDefaults(t) t = SetOldTransportDefaults(t)
// Allow clients to disable http2 if needed. // Allow HTTP2 clients but default off for now
if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 { if s := os.Getenv("ENABLE_HTTP2"); len(s) > 0 {
glog.Infof("HTTP2 has been explicitly disabled")
} else {
if err := http2.ConfigureTransport(t); err != nil { if err := http2.ConfigureTransport(t); err != nil {
glog.Warningf("Transport failed http2 configuration: %v", err) glog.Warningf("Transport failed http2 configuration: %v", err)
} }