From f3cecf952e5ec6dd480fd7722f0ed1cff25d0ad4 Mon Sep 17 00:00:00 2001 From: "Z.SX" Date: Wed, 15 May 2024 09:32:56 +0800 Subject: [PATCH] http3: rename ListenAndServe to ListenAndServeTLS (#4522) * http3: rename ListenAndServe to ListenAndServeTLS * http3: fix golanglint --------- Co-authored-by: Shunxin Zhang --- example/main.go | 2 +- http3/server.go | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/example/main.go b/example/main.go index 729da6dad..d242ba4e6 100644 --- a/example/main.go +++ b/example/main.go @@ -163,7 +163,7 @@ func main() { go func() { var err error if *tcp { - err = http3.ListenAndServe(bCap, certFile, keyFile, handler) + err = http3.ListenAndServeTLS(bCap, certFile, keyFile, handler) } else { server := http3.Server{ Handler: handler, diff --git a/http3/server.go b/http3/server.go index 4042da334..5d7aec8a5 100644 --- a/http3/server.go +++ b/http3/server.go @@ -666,11 +666,16 @@ func ListenAndServeQUIC(addr, certFile, keyFile string, handler http.Handler) er return server.ListenAndServeTLS(certFile, keyFile) } -// ListenAndServe listens on the given network address for both TLS/TCP and QUIC +// Deprecated: use ListenAndServeTLS instead. +func ListenAndServe(addr, certFile, keyFile string, handler http.Handler) error { + return ListenAndServeTLS(addr, certFile, keyFile, handler) +} + +// ListenAndServeTLS listens on the given network address for both TLS/TCP and QUIC // connections in parallel. It returns if one of the two returns an error. // http.DefaultServeMux is used when handler is nil. // The correct Alt-Svc headers for QUIC are set. -func ListenAndServe(addr, certFile, keyFile string, handler http.Handler) error { +func ListenAndServeTLS(addr, certFile, keyFile string, handler http.Handler) error { // Load certs var err error certs := make([]tls.Certificate, 1)