From ba5e308ea9496e4be0bd8c59a5291359e0ea98b4 Mon Sep 17 00:00:00 2001 From: Damien Mathieu <42@dmathieu.com> Date: Thu, 22 Feb 2018 08:17:15 +0000 Subject: [release-branch.go1.10] net/http: lock the read-only mutex in shouldRedirect Since that method uses `mux.m`, we need to lock the mutex to avoid data races. Fixes #27129 Change-Id: I998448a6e482b5d6a1b24f3354bb824906e23172 Reviewed-on: https://go-review.googlesource.com/95775 Reviewed-by: Andrew Bonventre Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot --- src/net/http/serve_test.go | 10 ++++++++++ src/net/http/server.go | 3 +++ 2 files changed, 13 insertions(+) diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index 9cbfe872af..1df319ac1f 100644 --- a/src/net/http/serve_test.go +++ b/src/net/http/serve_test.go @@ -581,6 +581,16 @@ func TestServeWithSlashRedirectForHostPatterns(t *testing.T) { } } +func TestShouldRedirectConcurrency(t *testing.T) { + setParallel(t) + defer afterTest(t) + + mux := NewServeMux() + ts := httptest.NewServer(mux) + defer ts.Close() + mux.HandleFunc("/", func(w ResponseWriter, r *Request) {}) +} + func BenchmarkServeMux(b *testing.B) { type test struct { diff --git a/src/net/http/server.go b/src/net/http/server.go index 57e1b5dacb..88e00a2edd 100644 --- a/src/net/http/server.go +++ b/src/net/http/server.go @@ -2233,6 +2233,9 @@ func (mux *ServeMux) redirectToPathSlash(host, path string, u *url.URL) (*url.UR // path+"/". This should happen if a handler is registered for path+"/" but // not path -- see comments at ServeMux. func (mux *ServeMux) shouldRedirect(host, path string) bool { + mux.mu.RLock() + defer mux.mu.RUnlock() + p := []string{path, host + path} for _, c := range p { -- cgit v1.2.3-54-g00ecf