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

Add BaseContext to http servers

Browse source
This commit is contained in:
H1JK 2023-04-08 18:46:35 +08:00 committed by 世界
parent d5f94b65b7
commit e1d96cb64e
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
inbound/naive.go
View file

@ -90,6 +90,9 @@ func (n *Naive) Start() error {
n.httpServer = &http.Server{ n.httpServer = &http.Server{
Handler: n, Handler: n,
TLSConfig: tlsConfig, TLSConfig: tlsConfig,
BaseContext: func(listener net.Listener) context.Context {
return n.ctx
},
} }
go func() { go func() {
var sErr error var sErr error

3
transport/v2raygrpclite/server.go
View file

@ -50,6 +50,9 @@ func NewServer(ctx context.Context, options option.V2RayGRPCOptions, tlsConfig t
} }
server.httpServer = &http.Server{ server.httpServer = &http.Server{
Handler: server, Handler: server,
BaseContext: func(net.Listener) context.Context {
return ctx
},
} }
server.h2cHandler = h2c.NewHandler(server, server.h2Server) server.h2cHandler = h2c.NewHandler(server, server.h2Server)
return server, nil return server, nil

3
transport/v2rayhttp/server.go
View file

@ -70,6 +70,9 @@ func NewServer(ctx context.Context, options option.V2RayHTTPOptions, tlsConfig t
Handler: server, Handler: server,
ReadHeaderTimeout: C.TCPTimeout, ReadHeaderTimeout: C.TCPTimeout,
MaxHeaderBytes: http.DefaultMaxHeaderBytes, MaxHeaderBytes: http.DefaultMaxHeaderBytes,
BaseContext: func(net.Listener) context.Context {
return ctx
},
} }
server.h2cHandler = h2c.NewHandler(server, server.h2Server) server.h2cHandler = h2c.NewHandler(server, server.h2Server)
return server, nil return server, nil

3
transport/v2raywebsocket/server.go
View file

@ -52,6 +52,9 @@ func NewServer(ctx context.Context, options option.V2RayWebsocketOptions, tlsCon
Handler: server, Handler: server,
ReadHeaderTimeout: C.TCPTimeout, ReadHeaderTimeout: C.TCPTimeout,
MaxHeaderBytes: http.DefaultMaxHeaderBytes, MaxHeaderBytes: http.DefaultMaxHeaderBytes,
BaseContext: func(net.Listener) context.Context {
return ctx
},
} }
return server, nil return server, nil
} }