From 8cd55615d4d00f48c30dff85d5d5e3f2adce70ce Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 10 Nov 2016 16:43:15 +0000 Subject: net/http: fix Server.Close double Lock Fixes #17878 Change-Id: I062ac514239068c58175c9ee7964b3590f956a82 Reviewed-on: https://go-review.googlesource.com/33026 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/net/http/serve_test.go | 7 +++++++ src/net/http/server.go | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/net/http/serve_test.go b/src/net/http/serve_test.go index 08b9862e16..6fd9912b5e 100644 --- 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 0959ac6f85..d78fd71a8d 100644 --- 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 { -- cgit v1.2.3-54-g00ecf