From: Tim Heckman <t@heckman.io>
Date: Tue, 5 Dec 2017 17:21:25 +0000 (-0800)
Subject: net/http: fix unclosed Listener leak in ListenAndServeTLS
X-Git-Tag: go1.10beta1~33
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a3c1a867e6e8516d031b540a11b3798cef04ffae;p=gostls13.git

net/http: fix unclosed Listener leak in ListenAndServeTLS

Fixes #23002

Change-Id: I87e72833757497aff49117dd40629cb7ec49e6e7
Reviewed-on: https://go-review.googlesource.com/81955
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---

diff --git a/src/net/http/server.go b/src/net/http/server.go
index 5338bee9b5..a46823c704 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -2998,6 +2998,8 @@ func (srv *Server) ListenAndServeTLS(certFile, keyFile string) error {
 		return err
 	}
 
+	defer ln.Close()
+
 	return srv.ServeTLS(tcpKeepAliveListener{ln.(*net.TCPListener)}, certFile, keyFile)
 }