Commit 54ffdf36 authored by Brad Fitzpatrick's avatar Brad Fitzpatrick

net/http: fix vet warning of leaked context in error paths

Updates #16230

Change-Id: Ie38f85419c41c00108f8843960280428a39789b5
Reviewed-on: https://go-review.googlesource.com/24850
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: 's avatarJosh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent 54b499e3
...@@ -775,9 +775,6 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) { ...@@ -775,9 +775,6 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) {
return nil, badRequestError("unsupported protocol version") return nil, badRequestError("unsupported protocol version")
} }
ctx, cancelCtx := context.WithCancel(ctx)
req.ctx = ctx
c.lastMethod = req.Method c.lastMethod = req.Method
c.r.setInfiniteReadLimit() c.r.setInfiniteReadLimit()
...@@ -804,6 +801,8 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) { ...@@ -804,6 +801,8 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) {
} }
delete(req.Header, "Host") delete(req.Header, "Host")
ctx, cancelCtx := context.WithCancel(ctx)
req.ctx = ctx
req.RemoteAddr = c.remoteAddr req.RemoteAddr = c.remoteAddr
req.TLS = c.tlsState req.TLS = c.tlsState
if body, ok := req.Body.(*body); ok { if body, ok := req.Body.(*body); ok {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment