SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-06 05:17:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix crash in HTTP server again

Browse source
This commit is contained in:
世界 2024-03-10 16:52:08 +08:00
parent ec2595f010
commit 807a51bb81
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

42
protocol/http/handshake.go
View file

@ -23,7 +23,6 @@ import (
type Handler = N.TCPConnectionHandler type Handler = N.TCPConnectionHandler
func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Reader, authenticator *auth.Authenticator, handler Handler, metadata M.Metadata) error { func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Reader, authenticator *auth.Authenticator, handler Handler, metadata M.Metadata) error {
var httpClient *http.Client
for { for {
request, err := ReadRequest(reader) request, err := ReadRequest(reader)
if err != nil { if err != nil {
@ -116,28 +115,26 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
} }
var innerErr atomic.TypedValue[error] var innerErr atomic.TypedValue[error]
if httpClient == nil { httpClient := &http.Client{
httpClient = &http.Client{ Transport: &http.Transport{
Transport: &http.Transport{ DisableCompression: true,
DisableCompression: true, DialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
DialContext: func(ctx context.Context, network, address string) (net.Conn, error) { metadata.Destination = M.ParseSocksaddr(address)
metadata.Destination = M.ParseSocksaddr(address) metadata.Protocol = "http"
metadata.Protocol = "http" input, output := pipe.Pipe()
input, output := pipe.Pipe() go func() {
go func() { hErr := handler.NewConnection(ctx, output, metadata)
hErr := handler.NewConnection(ctx, output, metadata) if hErr != nil {
if hErr != nil { innerErr.Store(hErr)
innerErr.Store(hErr) common.Close(input, output)
common.Close(input, output) }
} }()
}() return input, nil
return input, nil
},
}, },
CheckRedirect: func(req *http.Request, via []*http.Request) error { },
return http.ErrUseLastResponse CheckRedirect: func(req *http.Request, via []*http.Request) error {
}, return http.ErrUseLastResponse
} },
} }
requestCtx, cancel := context.WithCancel(ctx) requestCtx, cancel := context.WithCancel(ctx)
response, err := httpClient.Do(request.WithContext(requestCtx)) response, err := httpClient.Do(request.WithContext(requestCtx))
@ -163,7 +160,6 @@ func HandleConnection(ctx context.Context, conn net.Conn, reader *std_bufio.Read
} }
cancel() cancel()
if !keepAlive { if !keepAlive {
return conn.Close() return conn.Close()
} }