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

Fix tls config for h2 server

Browse source
This commit is contained in:
世界 2022-11-26 14:46:20 +08:00
parent bf20ff84b5
commit ee3cd49aa5
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
transport/v2raygrpclite/server.go
View file

@ -53,8 +53,8 @@ func NewServer(ctx context.Context, options option.V2RayGRPCOptions, tlsConfig t
if err != nil { if err != nil {
return nil, err return nil, err
} }
if !common.Contains(stdConfig.NextProtos, "h2") { if len(stdConfig.NextProtos) == 0 {
stdConfig.NextProtos = append(stdConfig.NextProtos, "h2") stdConfig.NextProtos = []string{http2.NextProtoTLS}
} }
server.httpServer.TLSConfig = stdConfig server.httpServer.TLSConfig = stdConfig
} }
@ -96,10 +96,14 @@ func (s *Server) badRequest(request *http.Request, err error) {
} }
func (s *Server) Serve(listener net.Listener) error { func (s *Server) Serve(listener net.Listener) error {
fixTLSConfig := 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 { if s.httpServer.TLSConfig == nil {
return s.httpServer.Serve(listener) return s.httpServer.Serve(listener)
} else { } else {

4
transport/v2rayhttp/server.go
View file

@ -133,10 +133,14 @@ func (s *Server) badRequest(request *http.Request, err error) {
} }
func (s *Server) Serve(listener net.Listener) error { func (s *Server) Serve(listener net.Listener) error {
fixTLSConfig := 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 { if s.httpServer.TLSConfig == nil {
return s.httpServer.Serve(listener) return s.httpServer.Serve(listener)
} else { } else {