net/http: fix Server.Close double Lock

Fixes #17878

Change-Id: I062ac514239068c58175c9ee7964b3590f956a82
Reviewed-on: https://go-review.googlesource.com/33026
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go
index 08b9862e163a4417981832052ef9be7feff00e60..6fd9912b5e0259745d73a3b576336b69f3bd4677 100644 (file)
--- a/src/net/http/serve_test.go
+++ b/src/net/http/serve_test.go
@@ -4988,3 +4988,10 @@ func testServerShutdown(t *testing.T, h2 bool) {
                t.Fatal("second request should fail. server should be shut down")
        }
 }
+
+// Issue 17878: tests that we can call Close twice.
+func TestServerCloseDeadlock(t *testing.T) {
+       var s Server
+       s.Close()
+       s.Close()
+}

diff --git a/src/net/http/server.go b/src/net/http/server.go
index 0959ac6f854e49f47cd57148f0f7b778800eaa2d..d78fd71a8dfc358e13fdbd6d4c3b2bad7c1fa713 100644 (file)
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -2362,7 +2362,7 @@ func (s *Server) closeDoneChanLocked() {
 // regardless of their state. For a graceful shutdown, use Shutdown.
 func (s *Server) Close() error {
        s.mu.Lock()
-       defer s.mu.Lock()
+       defer s.mu.Unlock()
        s.closeDoneChanLocked()
        err := s.closeListenersLocked()
        for c := range s.activeConn {