Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: reset response after reset user values on keep-alive connections #1176

Merged
merged 1 commit into from Dec 16, 2021
Merged

fix: reset response after reset user values on keep-alive connections #1176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions server.go
View file
Open in desktop
Expand Up @@ -2079,7 +2079,7 @@ func (s *Server) serveConn(c net.Conn) (err error) {
connectionClose bool
isHTTP11 bool

reqReset bool
reqReset, respReset bool
continueReadingRequest bool = true
)
for {
Expand Down Expand Up @@ -2118,7 +2118,7 @@ func (s *Server) serveConn(c net.Conn) (err error) {
br, err = acquireByteReader(&ctx)
}

reqReset = false
reqReset, respReset = false, false
ctx.Request.isTLS = isTLS
ctx.Response.Header.noDefaultContentType = s.NoDefaultContentType
ctx.Response.Header.noDefaultDate = s.NoDefaultDate
Expand Down Expand Up @@ -2403,8 +2403,9 @@ func (s *Server) serveConn(c net.Conn) (err error) {
s.setState(c, StateIdle)
ctx.userValues.Reset()

reqReset = true
reqReset, respReset = true, true
ctx.Request.Reset()
ctx.Response.Reset()

if atomic.LoadInt32(&s.stop) == 1 {
err = nil
Expand All @@ -2420,11 +2421,14 @@ func (s *Server) serveConn(c net.Conn) (err error) {
}
if ctx != nil {
// in unexpected cases the for loop will break
// before request reset call. in such cases, call it before
// before request/response reset call. in such cases, call it before
// release to fix #548
if !reqReset {
ctx.Request.Reset()
}
if !respReset {
ctx.Response.Reset()
}
s.releaseCtx(ctx)
}
return
Expand Down Expand Up @@ -2511,7 +2515,7 @@ func writeResponse(ctx *RequestCtx, w *bufio.Writer) error {
panic("BUG: cannot write timed out response")
}
err := ctx.Response.Write(w)
ctx.Response.Reset()

return err
}

Expand Down Expand Up @@ -2796,8 +2800,11 @@ func (s *Server) writeErrorResponse(bw *bufio.Writer, ctx *RequestCtx, serverNam
if bw == nil {
bw = acquireWriter(ctx)
}

writeResponse(ctx, bw) //nolint:errcheck
ctx.Response.Reset()
bw.Flush()

return bw
}

Expand Down
14 changes: 12 additions & 2 deletions server_test.go
View file
Open in desktop
Expand Up @@ -14,6 +14,7 @@ import (
"net"
"os"
"reflect"
"regexp"
"strings"
"sync"
"testing"
Expand Down Expand Up @@ -2041,23 +2042,28 @@ func TestRequestCtxWriteString(t *testing.T) {
}
}

func TestServeConnKeepRequestValuesUntilResetUserValues(t *testing.T) {
func TestServeConnKeepRequestAndResponseUntilResetUserValues(t *testing.T) {
t.Parallel()

reqStr := "POST /foo HTTP/1.0\r\nHost: google.com\r\nContent-Type: application/octet-stream\r\nContent-Length: 0\r\nConnection: keep-alive\r\n\r\n"
respRegex := regexp.MustCompile("HTTP/1.1 308 Permanent Redirect\r\nServer: fasthttp\r\nDate: (.*)\r\nContent-Length: 0\r\nConnection: keep-alive\r\n\r\n")

rw := &readWriter{}
rw.r.WriteString(reqStr)

var resultReqStr string
var resultReqStr, resultRespStr string

ch := make(chan struct{})
go func() {
err := ServeConn(rw, func(ctx *RequestCtx) {
ctx.Response.SetStatusCode(StatusPermanentRedirect)

ctx.SetUserValue("myKey", &closerWithRequestCtx{
ctx: ctx,
closeFunc: func(closerCtx *RequestCtx) error {
resultReqStr = closerCtx.Request.String()
resultRespStr = closerCtx.Response.String()

return nil
}})
})
Expand All @@ -2076,6 +2082,10 @@ func TestServeConnKeepRequestValuesUntilResetUserValues(t *testing.T) {
if resultReqStr != reqStr {
t.Errorf("Request == %s, want %s", resultReqStr, reqStr)
}

if !respRegex.MatchString(resultRespStr) {
t.Errorf("Response == %s, want regex %s", resultRespStr, respRegex)
}
}

func TestServeConnNonHTTP11KeepAlive(t *testing.T) {
Expand Down