VG-1354 backport of golang#35750

lifepod-solutions · May 4, 2020 · acb083a · acb083a
1 parent 5ffd591
commit acb083a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/net/http/server.go b/src/net/http/server.go
@@ -2893,16 +2893,17 @@ func (srv *Server) Serve(l net.Listener) error {
 			}
 			return e
 		}
+		connCtx := ctx
 		if cc := srv.ConnContext; cc != nil {
-			ctx = cc(ctx, rw)
-			if ctx == nil {
+			connCtx = cc(connCtx, rw)
+			if connCtx == nil {
 				panic("ConnContext returned nil")
 			}
 		}
 		tempDelay = 0
 		c := srv.newConn(rw)
 		c.setState(c.rwc, StateNew) // before Serve can return
-		go c.serve(ctx)
+		go c.serve(connCtx)
 	}
 }