Skip to content

Commit 36787d9

Browse files
committed
TUN-4153: Revert best-effort HTTP2 usage when talking to origins
This commit reverts part of 1cf6ae3.
1 parent 5afa325 commit 36787d9

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CHANGES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
**Experimental**: This is a new format for release notes. The format and availability is subject to change.
22

3+
## 2021.3.6
4+
5+
### Bug Fixes
6+
7+
- Reverted 2021.3.5 improvement to use HTTP/2 in a best-effort manner between cloudflared and origin services because
8+
it was found to break in some cases.
9+
310
## 2021.3.5
411

512
### Improvements

ingress/origin_service.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ import (
1515
"github.com/pkg/errors"
1616
"github.com/rs/zerolog"
1717

18-
"golang.org/x/net/http2"
19-
2018
"github.com/cloudflare/cloudflared/hello"
2119
"github.com/cloudflare/cloudflared/ipaccess"
2220
"github.com/cloudflare/cloudflared/socks"
@@ -289,7 +287,6 @@ func newHTTPTransport(service originService, cfg OriginRequestConfig, log *zerol
289287
httpTransport.DialContext = dialContext
290288
}
291289

292-
http2.ConfigureTransport(&httpTransport)
293290
return &httpTransport, nil
294291
}
295292

0 commit comments

Comments
 (0)