diff options
| author | Wim <wim@42.be> | 2021-05-30 00:25:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 00:25:30 +0200 |
| commit | 4091b6f6b4fe01876f8720332675f9c69be39541 (patch) | |
| tree | 07a1f2b2eeba6fb680b5edc19d2d38ec81243c0a /vendor/golang.org/x/net/http2/h2c/h2c.go | |
| parent | 766f35554e16ee5462370be714ef29b71745d478 (diff) | |
| download | matterbridge-msglm-4091b6f6b4fe01876f8720332675f9c69be39541.tar.gz matterbridge-msglm-4091b6f6b4fe01876f8720332675f9c69be39541.tar.bz2 matterbridge-msglm-4091b6f6b4fe01876f8720332675f9c69be39541.zip | |
Update vendor (#1498)
Diffstat (limited to 'vendor/golang.org/x/net/http2/h2c/h2c.go')
| -rw-r--r-- | vendor/golang.org/x/net/http2/h2c/h2c.go | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vendor/golang.org/x/net/http2/h2c/h2c.go b/vendor/golang.org/x/net/http2/h2c/h2c.go index 07c5c9a6..16319b8f 100644 --- a/vendor/golang.org/x/net/http2/h2c/h2c.go +++ b/vendor/golang.org/x/net/http2/h2c/h2c.go @@ -84,14 +84,20 @@ func (s h2cHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } defer conn.Close() - s.s.ServeConn(conn, &http2.ServeConnOpts{Handler: s.Handler}) + s.s.ServeConn(conn, &http2.ServeConnOpts{ + Context: r.Context(), + Handler: s.Handler, + }) return } // Handle Upgrade to h2c (RFC 7540 Section 3.2) if conn, err := h2cUpgrade(w, r); err == nil { defer conn.Close() - s.s.ServeConn(conn, &http2.ServeConnOpts{Handler: s.Handler}) + s.s.ServeConn(conn, &http2.ServeConnOpts{ + Context: r.Context(), + Handler: s.Handler, + }) return } |