Merge pull request #29283 from timothysc/http2_default_disable

Automatic merge from submit-queue Revert "Follow on for 1.4 to default HTTP2 on by default" This reverts commit efe25553 in order to address: #29001 #28537

Merge pull request #29283 from timothysc/http2_default_disable
70594e82 · k8s-merge-robot · GitHub · 0f1a3587 · 8cb799c7 · 70594e82
Commit 70594e82 authored Jul 20, 2016 by k8s-merge-robot Committed by GitHub Jul 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

http.go pkg/util/net/http.go +2 -4

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