yanistyle/sing-box-extended
1
0
Fork 0
mirror of https://github.com/shtorm-7/sing-box-extended.git synced 2026-08-08 19:45:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix XHTTP dialing

Browse Source
This commit is contained in:
Shtorm
2026-08-08 10:10:05 +03:00
parent 00d3ed46bf
commit da50e2969d
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
transport/v2rayxhttp/dialer.go
View File

@@ -3,6 +3,7 @@ package xhttp
import ( import (
"bytes" "bytes"
"context" "context"
"errors"
"fmt" "fmt"
"io" "io"
"net" "net"
@@ -110,15 +111,17 @@ func (c *DefaultDialerClient) OpenStream(ctx context.Context, url string, sessio
if body != nil { if body != nil {
method = c.options.GetNormalizedUplinkHTTPMethod() // stream-up/one method = c.options.GetNormalizedUplinkHTTPMethod() // stream-up/one
} }
req, _ := http.NewRequestWithContext(context.WithoutCancel(ctx), method, url, body) reqCtx, cancel := context.WithCancel(context.WithoutCancel(ctx))
req, _ := http.NewRequestWithContext(reqCtx, method, url, body)
FillStreamRequest(req, sessionId, "", c.options) FillStreamRequest(req, sessionId, "", c.options)
wrc = &WaitReadCloser{Wait: make(chan struct{})} wrc = &WaitReadCloser{Wait: make(chan struct{}), Cancel: cancel}
go func() { go func() {
resp, err := c.client.Do(req) resp, err := c.client.Do(req)
if err != nil { if err != nil {
if !uploadOnly { // stream-down is enough if !uploadOnly && !errors.Is(err, context.Canceled) { // stream-down is enough
c.Close() c.Close()
} }
cancel()
gotConn.Close() gotConn.Close()
common.Close(body) common.Close(body)
wrc.Close() wrc.Close()
@@ -128,6 +131,7 @@ func (c *DefaultDialerClient) OpenStream(ctx context.Context, url string, sessio
io.Copy(io.Discard, resp.Body) io.Copy(io.Discard, resp.Body)
resp.Body.Close() // if it is called immediately, the upload will be interrupted also resp.Body.Close() // if it is called immediately, the upload will be interrupted also
common.Close(body) common.Close(body)
cancel()
wrc.Close() wrc.Close()
return return
} }
@@ -210,7 +214,8 @@ func (c *DefaultDialerClient) PostPacket(ctx context.Context, url string, sessio
} }
type WaitReadCloser struct { type WaitReadCloser struct {
Wait chan struct{} Wait chan struct{}
Cancel context.CancelFunc
io.ReadCloser io.ReadCloser
} }
@@ -233,6 +238,9 @@ func (w *WaitReadCloser) Read(b []byte) (int, error) {
} }
func (w *WaitReadCloser) Close() error { func (w *WaitReadCloser) Close() error {
if w.Cancel != nil {
w.Cancel()
}
if w.ReadCloser != nil { if w.ReadCloser != nil {
return w.ReadCloser.Close() return w.ReadCloser.Close()
} }