gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

http3: rename ListenAndServe to ListenAndServeTLS (#4522)

Browse Source 
* http3: rename ListenAndServe to ListenAndServeTLS

* http3: fix golanglint

---------

Co-authored-by: Shunxin Zhang <shunxin.zhang@shopee.com>
This commit is contained in:
Z.SX
2024-05-15 09:32:56 +08:00
committed by GitHub
parent e41d1f9dd7
commit f3cecf952e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
example/main.go
View File

@@ -163,7 +163,7 @@ func main() {
go func() { go func() {
var err error var err error
if *tcp { if *tcp {
err = http3.ListenAndServe(bCap, certFile, keyFile, handler) err = http3.ListenAndServeTLS(bCap, certFile, keyFile, handler)
} else { } else {
server := http3.Server{ server := http3.Server{
Handler: handler, Handler: handler,

9
http3/server.go
View File

@@ -666,11 +666,16 @@ func ListenAndServeQUIC(addr, certFile, keyFile string, handler http.Handler) er
return server.ListenAndServeTLS(certFile, keyFile) 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. // connections in parallel. It returns if one of the two returns an error.
// http.DefaultServeMux is used when handler is nil. // http.DefaultServeMux is used when handler is nil.
// The correct Alt-Svc headers for QUIC are set. // 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 // Load certs
var err error var err error
certs := make([]tls.Certificate, 1) certs := make([]tls.Certificate, 1)