aboutsummaryrefslogtreecommitdiff
path: root/src/net/http
diff options
context:
space:
mode:
authorchressie <chressie@golang.org>2026-03-24 07:03:10 +0000
committerChressie Himpel <chressie@golang.org>2026-03-24 08:03:55 -0700
commit0613d0309ce820ee651d7a0cf8e158c87fc6c444 (patch)
tree18500679fa9c6b1a89fee2d857fd6b6c16ad368d /src/net/http
parent9b4244e9eaab2b2b4bdf197462d336ac2e3a5284 (diff)
downloadgo-0613d0309ce820ee651d7a0cf8e158c87fc6c444.tar.xz
net/http: fix panic in ServeTLS on nil TLSConfig
Change-Id: I9bc588128ec36bb3725d15e52400b76a94e5cb3a Reviewed-on: https://go-review.googlesource.com/c/go/+/758560 LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Nicholas Husin <nsh@golang.org> Reviewed-by: Nicholas Husin <husin@google.com>
Diffstat (limited to 'src/net/http')
-rw-r--r--src/net/http/server.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/net/http/server.go b/src/net/http/server.go
index 90e8488959..c25e83b704 100644
--- a/src/net/http/server.go
+++ b/src/net/http/server.go
@@ -3539,7 +3539,11 @@ func (s *Server) ServeTLS(l net.Listener, certFile, keyFile string) error {
return err
}
- config, err := s.setupTLSConfig(certFile, keyFile, adjustNextProtos(s.TLSConfig.NextProtos, s.protocols()))
+ var nextProtos []string
+ if s.TLSConfig != nil {
+ nextProtos = s.TLSConfig.NextProtos
+ }
+ config, err := s.setupTLSConfig(certFile, keyFile, adjustNextProtos(nextProtos, s.protocols()))
if err != nil {
return err
}