Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ coverage:
# pass if coverage drops by no more than 0.05%
# this is possibly caused by unstable coverage.
threshold: 0.05%
patch:
default:
target: 80%
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ go 1.19
require (
github.com/bytedance/gopkg v0.1.3
github.com/bytedance/sonic v1.15.0
github.com/cloudwego/gopkg v0.1.11-0.20260226101607-10def4e32fd1
github.com/cloudwego/netpoll v0.7.2
github.com/cloudwego/gopkg v0.1.11-0.20260303065100-1e5551ecf390
github.com/cloudwego/netpoll v0.7.3-0.20260305035010-81277e4f7b67
github.com/fsnotify/fsnotify v1.5.4
github.com/stretchr/testify v1.10.0
github.com/tidwall/gjson v1.14.4
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCc
github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M=
github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU=
github.com/cloudwego/gopkg v0.1.4/go.mod h1:FQuXsRWRsSqJLsMVd5SYzp8/Z1y5gXKnVvRrWUOsCMI=
github.com/cloudwego/gopkg v0.1.11-0.20260226101607-10def4e32fd1 h1:wg+raHia1H813G0yldWSUb5dzgWccrOEftHct9O7Nvs=
github.com/cloudwego/gopkg v0.1.11-0.20260226101607-10def4e32fd1/go.mod h1:wQv2rXOgrRCYdIrOce+xnAF7MA30CkofQZ3JHZOXY+8=
github.com/cloudwego/netpoll v0.7.2 h1:4qDBGQ6CG2SvEXhZSDxMdtqt/NLDxjAVk0PC/biKiJo=
github.com/cloudwego/netpoll v0.7.2/go.mod h1:PI+YrmyS7cIr0+SD4seJz3Eo3ckkXdu2ZVKBLhURLNU=
github.com/cloudwego/gopkg v0.1.11-0.20260303065100-1e5551ecf390 h1:DERt3Cue/q307RWCd+pPXvzuqmujrrzORgShkeU4Q0s=
github.com/cloudwego/gopkg v0.1.11-0.20260303065100-1e5551ecf390/go.mod h1:wQv2rXOgrRCYdIrOce+xnAF7MA30CkofQZ3JHZOXY+8=
github.com/cloudwego/netpoll v0.7.3-0.20260305035010-81277e4f7b67 h1:0dwPCnAMoeEupEKCAR4paadnmaq39MVdxvmEVlwcu3g=
github.com/cloudwego/netpoll v0.7.3-0.20260305035010-81277e4f7b67/go.mod h1:PI+YrmyS7cIr0+SD4seJz3Eo3ckkXdu2ZVKBLhURLNU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
Expand Down
5 changes: 2 additions & 3 deletions pkg/app/server/hertz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,8 @@ func TestHertz_Run(t *testing.T) {
waitEngineRunning(hertz)

hertz.Close()
resp, err := http.Get(fullURL(ln, "/test"))
assert.NotNil(t, err)
assert.Nil(t, resp)
time.Sleep(10 * time.Millisecond)
// Close will not call OnShutdown
assert.DeepEqual(t, uint32(0), atomic.LoadUint32(&testint))
}

Expand Down
16 changes: 8 additions & 8 deletions pkg/network/standard/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"time"

"github.com/cloudwego/gopkg/bufiox"
"github.com/cloudwego/gopkg/connstate"
"github.com/cloudwego/gopkg/net/connstate"

errs "github.com/cloudwego/hertz/pkg/common/errors"
"github.com/cloudwego/hertz/pkg/common/hlog"
Expand All @@ -38,6 +38,8 @@ type Conn struct {
br *bufiox.DefaultReader
bw *bufiox.DefaultWriter
stater connstate.ConnStater

buf [8]byte
}

func (c *Conn) ToHertzError(err error) error {
Expand Down Expand Up @@ -100,15 +102,13 @@ func (c *Conn) Len() int {
}

// ReadByte is used to read one byte with advancing the read pointer.
func (c *Conn) ReadByte() (byte, error) {
b, err := c.Peek(1)
func (c *Conn) ReadByte() (b byte, err error) {
// Use Read instead of Peek+Skip to avoid holding a ref to the underlying buffer.
_, err = c.br.Read(c.buf[:1])
if err == nil {
err = c.Skip(1)
}
if err != nil {
return ' ', err
b = c.buf[0]
}
return b[0], nil
return
}

// ReadBinary is used to read next n byte with copy, and the read pointer will be advanced.
Expand Down
2 changes: 1 addition & 1 deletion pkg/network/standard/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"sync/atomic"
"time"

"github.com/cloudwego/gopkg/connstate"
"github.com/cloudwego/gopkg/net/connstate"

"github.com/cloudwego/hertz/pkg/common/config"
"github.com/cloudwego/hertz/pkg/common/hlog"
Expand Down
2 changes: 1 addition & 1 deletion pkg/network/standard/unix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"
"time"

"github.com/cloudwego/gopkg/connstate"
"github.com/cloudwego/gopkg/net/connstate"

"github.com/cloudwego/hertz/pkg/common/config"
)
Expand Down
6 changes: 6 additions & 0 deletions pkg/protocol/http1/ext/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,12 @@ func appendBodyFixedSize(r network.Reader, dst []byte, n int) ([]byte, error) {
}
dst = dst[:dstLen]

// Prefer io.Reader over Peek to avoid holding a ref to the underlying buffer.
if rd, ok := r.(io.Reader); ok {
rn, err := io.ReadFull(rd, dst[offset:])
return dst[:offset+rn], err
}

// Peek can get all data, otherwise it will through error
buf, err := r.Peek(n)
if err != nil {
Expand Down