From c3ed6ea481742390f1ecf2c26076c40f1df7f893 Mon Sep 17 00:00:00 2001 From: gospider <2216403312@qq.com> Date: Sun, 17 Aug 2025 21:23:53 +0800 Subject: [PATCH] sync --- conn.go | 6 +++++- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/conn.go b/conn.go index cd32de3..d1a60a9 100644 --- a/conn.go +++ b/conn.go @@ -23,8 +23,12 @@ func taskMain(conn http1.Conn, task *reqTask) (err error) { if err != nil { task.cnl(err) } else { + var bodyContext context.Context + if task.reqCtx.response != nil && task.reqCtx.response.Body != nil { + bodyContext = task.reqCtx.response.Body.(*http1.Body).Context() + } task.cnl(tools.ErrNoErr) - if bodyContext := conn.BodyContext(); bodyContext != nil { + if bodyContext != nil { select { case <-task.reqCtx.Context().Done(): if context.Cause(task.reqCtx.Context()) != tools.ErrNoErr { diff --git a/go.mod b/go.mod index 1705d22..a9074e6 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/gospider007/bs4 v0.0.0-20250815030800-a352d3ad57ee github.com/gospider007/gson v0.0.0-20250815030832-fa016f03a353 github.com/gospider007/gtls v0.0.0-20250815030824-aeefe4aaf3c3 - github.com/gospider007/http1 v0.0.0-20250815030711-c802b9917f04 - github.com/gospider007/http2 v0.0.0-20250815030719-fbb38e8381a2 - github.com/gospider007/http3 v0.0.0-20250815030725-99a8089709d2 + github.com/gospider007/http1 v0.0.0-20250817122009-0b953c2c8efa + github.com/gospider007/http2 v0.0.0-20250817122534-76043412544d + github.com/gospider007/http3 v0.0.0-20250817123336-07d66db6dbb3 github.com/gospider007/ja3 v0.0.0-20250815031055-0948dc3bbe0b github.com/gospider007/re v0.0.0-20250815031101-a57caeff73bf github.com/gospider007/tools v0.0.0-20250815031258-8a81d680917c diff --git a/go.sum b/go.sum index aa82707..d412d3e 100644 --- a/go.sum +++ b/go.sum @@ -114,12 +114,12 @@ github.com/gospider007/gson v0.0.0-20250815030832-fa016f03a353 h1:jrqXuLs1QzMZcl github.com/gospider007/gson v0.0.0-20250815030832-fa016f03a353/go.mod h1:nxA7Mekk0TdS1W+ycauVr8vW25mMXf9rxCGcGHNE28w= github.com/gospider007/gtls v0.0.0-20250815030824-aeefe4aaf3c3 h1:Kj2awlddsNnqbmQFVowbdkYo7SOaQR5N+oKldRDzb1s= github.com/gospider007/gtls v0.0.0-20250815030824-aeefe4aaf3c3/go.mod h1:Np1+9Lmsm3g1LtDl3C8OOsMXfHRdOwyd7olW8YJMGLo= -github.com/gospider007/http1 v0.0.0-20250815030711-c802b9917f04 h1:R/eeznoLE446gRpdd/j6n96lB6f5IEsVjXbVWuKaOYk= -github.com/gospider007/http1 v0.0.0-20250815030711-c802b9917f04/go.mod h1:ALEW+Xni1vkhOL3IvHlvt58TKdpY4HnvkiG2pPr09ss= -github.com/gospider007/http2 v0.0.0-20250815030719-fbb38e8381a2 h1:VDb9NAYYMHznYqdOTTudTHQ1EiL8xDive3HauWBkX08= -github.com/gospider007/http2 v0.0.0-20250815030719-fbb38e8381a2/go.mod h1:w/J7MCVldspRGmAU3tXd8LoOtNFzSoNJiPSDYg2U3Do= -github.com/gospider007/http3 v0.0.0-20250815030725-99a8089709d2 h1:DO/0+e9kqBHWAsCXaVEJCSdKa60zwN1NVc22bU3Lxz4= -github.com/gospider007/http3 v0.0.0-20250815030725-99a8089709d2/go.mod h1:8b58Gthj624boZRiJg3rHnWptn/dFlgl2BYAWakDfjk= +github.com/gospider007/http1 v0.0.0-20250817122009-0b953c2c8efa h1:SJPg55yHMzcrprjvBA2YBMYCmIRauhFtQGL6QVTManM= +github.com/gospider007/http1 v0.0.0-20250817122009-0b953c2c8efa/go.mod h1:2KmewDOljCqfLfbSiIzuohAHvivZwj9pSd25pGEVvfE= +github.com/gospider007/http2 v0.0.0-20250817122534-76043412544d h1:PShVXqSaKS0mOpkvYEyrSDRtUQokcBMDinKvLVs5w4M= +github.com/gospider007/http2 v0.0.0-20250817122534-76043412544d/go.mod h1:EcnDTIf0fxFLBtfRIsqJhjdzscPz7XA4/HDIyjJjS9M= +github.com/gospider007/http3 v0.0.0-20250817123336-07d66db6dbb3 h1:UEkuAplbHpLw1eKhH/Dxb/kCfpksOa2ZZrWnbzdBLKs= +github.com/gospider007/http3 v0.0.0-20250817123336-07d66db6dbb3/go.mod h1:CX1ftEftVGuareeDGVtKhUIb+NymniWijLiS9YSWzeM= github.com/gospider007/ja3 v0.0.0-20250815031055-0948dc3bbe0b h1:5KIC/KDX6/gqOLpFD/ZaHGjqEh5UcBWhqmS9EQVUmX8= github.com/gospider007/ja3 v0.0.0-20250815031055-0948dc3bbe0b/go.mod h1:RL5TNXk0uuyzZhcAa33WLAIsTSc1Lo0JRsR+aarH4A0= github.com/gospider007/kinds v0.0.0-20250815031133-b2282666f69c h1:WnFZf0v+Du5nH/R3pq5QwkTcfVxLqVMRp2dPaI6w6YY=