From 36787d9cf75db9617361f083fcca34949194d160 Mon Sep 17 00:00:00 2001 From: Nuno Diegues Date: Wed, 31 Mar 2021 08:20:03 +0100 Subject: [PATCH] TUN-4153: Revert best-effort HTTP2 usage when talking to origins This commit reverts part of 1cf6ae37ebf5b637576c43dcd00cf7330c3e3222. --- CHANGES.md | 7 +++++++ ingress/origin_service.go | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 48b75ce9..45c8117d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,12 @@ **Experimental**: This is a new format for release notes. The format and availability is subject to change. +## 2021.3.6 + +### Bug Fixes + +- Reverted 2021.3.5 improvement to use HTTP/2 in a best-effort manner between cloudflared and origin services because + it was found to break in some cases. + ## 2021.3.5 ### Improvements diff --git a/ingress/origin_service.go b/ingress/origin_service.go index aa2587b3..eeff7ebc 100644 --- a/ingress/origin_service.go +++ b/ingress/origin_service.go @@ -15,8 +15,6 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "golang.org/x/net/http2" - "github.com/cloudflare/cloudflared/hello" "github.com/cloudflare/cloudflared/ipaccess" "github.com/cloudflare/cloudflared/socks" @@ -289,7 +287,6 @@ func newHTTPTransport(service originService, cfg OriginRequestConfig, log *zerol httpTransport.DialContext = dialContext } - http2.ConfigureTransport(&httpTransport) return &httpTransport, nil }