From d5e3832bc0f5174a679d0cc13237c876a2930639 Mon Sep 17 00:00:00 2001
From: "Timothy St. Clair" <tstclair@redhat.com>
Date: Wed, 7 Sep 2016 16:21:08 -0500
Subject: [PATCH] Revert "Revert "Follow on for 1.4 to default HTTP2 on by
 default""

This reverts commit 8cb799c7897c029863cd9051b8e033991d29fe88.
---
 pkg/util/net/http.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/util/net/http.go b/pkg/util/net/http.go
index 15df077412e..bfe2e09375a 100644
--- a/pkg/util/net/http.go
+++ b/pkg/util/net/http.go
@@ -77,8 +77,10 @@ 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 HTTP2 clients but default off for now
-	if s := os.Getenv("ENABLE_HTTP2"); len(s) > 0 {
+	// Allow clients to disable http2 if needed.
+	if s := os.Getenv("DISABLE_HTTP2"); len(s) > 0 {
+		glog.Infof("HTTP2 has been explicitly disabled")
+	} else {
 		if err := http2.ConfigureTransport(t); err != nil {
 			glog.Warningf("Transport failed http2 configuration: %v", err)
 		}