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: Josh Bleecher Snyder <josharian@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/net/http/server.go b/src/net/http/server.go
index 7c3237c4cd4e6404403de76c938797ca5d53bc82..9bf4d667e2e4066c1db59bde7324204e7e26c390 100644 (file)
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -775,9 +775,6 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) {
                return nil, badRequestError("unsupported protocol version")
        }
 
-       ctx, cancelCtx := context.WithCancel(ctx)
-       req.ctx = ctx
-
        c.lastMethod = req.Method
        c.r.setInfiniteReadLimit()
 
@@ -804,6 +801,8 @@ func (c *conn) readRequest(ctx context.Context) (w *response, err error) {
        }
        delete(req.Header, "Host")
 
+       ctx, cancelCtx := context.WithCancel(ctx)
+       req.ctx = ctx
        req.RemoteAddr = c.remoteAddr
        req.TLS = c.tlsState
        if body, ok := req.Body.(*body); ok {