black-internet-days-ahead/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2024-11-22 00:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix create badhttp2 server

Browse source
This commit is contained in:
世界 2023-03-01 10:41:09 +08:00
parent 5af8d001ae
commit b14ae51f71
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
transport/v2raygrpclite/server_badhttp.go
View file

@ -98,18 +98,14 @@ func (s *Server) fallbackRequest(ctx context.Context, writer http.ResponseWriter
} }
func (s *Server) Serve(listener net.Listener) error { func (s *Server) Serve(listener net.Listener) error {
fixTLSConfig := s.httpServer.TLSConfig == nil if s.httpServer.TLSConfig != nil {
err := http2.ConfigureServer(s.httpServer, s.h2Server) err := http2.ConfigureServer(s.httpServer, s.h2Server)
if err != nil { if err != nil {
return err return err
} }
if fixTLSConfig {
s.httpServer.TLSConfig = nil
}
if s.httpServer.TLSConfig == nil {
return s.httpServer.Serve(listener)
} else {
return s.httpServer.ServeTLS(listener, "", "") return s.httpServer.ServeTLS(listener, "", "")
} else {
return s.httpServer.Serve(listener)
} }
} }

18
transport/v2rayhttp/server_badhttp.go
View file

@ -134,18 +134,14 @@ func (s *Server) fallbackRequest(ctx context.Context, writer http.ResponseWriter
} }
func (s *Server) Serve(listener net.Listener) error { func (s *Server) Serve(listener net.Listener) error {
fixTLSConfig := s.httpServer.TLSConfig == nil if s.httpServer.TLSConfig != nil {
err := http2.ConfigureServer(s.httpServer, s.h2Server) err := http2.ConfigureServer(s.httpServer, s.h2Server)
if err != nil { if err != nil {
return err return err
} }
if fixTLSConfig {
s.httpServer.TLSConfig = nil
}
if s.httpServer.TLSConfig == nil {
return s.httpServer.Serve(listener)
} else {
return s.httpServer.ServeTLS(listener, "", "") return s.httpServer.ServeTLS(listener, "", "")
} else {
return s.httpServer.Serve(listener)
} }
} }