mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-05 05:07:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

http3: fix listening on both QUIC and TCP (#3465)

Browse source
This commit is contained in:
mojatter 2022-08-21 00:56:28 +09:00 • committed by GitHub
parent 7da024da5a
commit dd521c0573
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
http3/server.go
View file

@ -709,19 +709,20 @@ func ListenAndServe(addr, certFile, keyFile string, handler http.Handler) error
tlsConn := tls.NewListener(tcpConn, config) tlsConn := tls.NewListener(tcpConn, config)
defer tlsConn.Close() defer tlsConn.Close()
// Start the servers
httpServer := &http.Server{}
quicServer := &Server{
TLSConfig: config,
}
if handler == nil { if handler == nil {
handler = http.DefaultServeMux handler = http.DefaultServeMux
} }
httpServer.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // Start the servers
quicServer.SetQuicHeaders(w.Header()) quicServer := &Server{
handler.ServeHTTP(w, r) TLSConfig: config,
}) Handler: handler,
}
httpServer := &http.Server{
Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
quicServer.SetQuicHeaders(w.Header())
handler.ServeHTTP(w, r)
}),
}
hErr := make(chan error) hErr := make(chan error)
qErr := make(chan error) qErr := make(chan error)