diff --git a/args.go b/args.go index 69a9189..3e4b946 100644 --- a/args.go +++ b/args.go @@ -20,8 +20,8 @@ type argsKV struct { value []byte } -// Clear clears query args. -func (a *Args) Clear() { +// Reset clears query args. +func (a *Args) Reset() { a.args = a.args[:0] } @@ -53,7 +53,7 @@ func (a *Args) Parse(s string) { // // It is safe modifying b buffer contents after ParseBytes return. func (a *Args) ParseBytes(b []byte) { - a.Clear() + a.Reset() var s argsScanner s.b = b diff --git a/client.go b/client.go index 1ec5fa1..b15bce6 100644 --- a/client.go +++ b/client.go @@ -406,7 +406,7 @@ func acquireRequest() *Request { } func releaseRequest(req *Request) { - req.Clear() + req.Reset() requestPool.Put(req) } @@ -419,7 +419,7 @@ func acquireResponse() *Response { } func releaseResponse(resp *Response) { - resp.Clear() + resp.Reset() responsePool.Put(resp) } diff --git a/cookie.go b/cookie.go index 888db4d..759c117 100644 --- a/cookie.go +++ b/cookie.go @@ -41,8 +41,8 @@ type Cookie struct { var zeroTime time.Time -// Clear clears the cookie. -func (c *Cookie) Clear() { +// Reset clears the cookie. +func (c *Cookie) Reset() { c.Key = c.Key[:0] c.Value = c.Value[:0] c.Expire = zeroTime @@ -87,7 +87,7 @@ func (c *Cookie) Parse(src string) error { // // It is safe modifying src buffer after function return. func (c *Cookie) ParseBytes(src []byte) error { - c.Clear() + c.Reset() var s cookieScanner s.b = src diff --git a/header.go b/header.go index b70d910..d91c376 100644 --- a/header.go +++ b/header.go @@ -337,8 +337,8 @@ func (h *RequestHeader) Len() int { return n } -// Clear clears response header. -func (h *ResponseHeader) Clear() { +// Reset clears response header. +func (h *ResponseHeader) Reset() { h.StatusCode = 0 h.connectionClose = false @@ -352,8 +352,8 @@ func (h *ResponseHeader) Clear() { h.cookies = h.cookies[:0] } -// Clear clears request header. -func (h *RequestHeader) Clear() { +// Reset clears request header. +func (h *RequestHeader) Reset() { h.connectionClose = false h.contentLength = 0 @@ -375,7 +375,7 @@ func (h *RequestHeader) Clear() { // CopyTo copies all the headers to dst. func (h *ResponseHeader) CopyTo(dst *ResponseHeader) { - dst.Clear() + dst.Reset() dst.StatusCode = h.StatusCode dst.connectionClose = h.connectionClose dst.contentLength = h.contentLength @@ -388,7 +388,7 @@ func (h *ResponseHeader) CopyTo(dst *ResponseHeader) { // CopyTo copies all the headers to dst. func (h *RequestHeader) CopyTo(dst *RequestHeader) { - dst.Clear() + dst.Reset() dst.connectionClose = h.connectionClose dst.contentLength = h.contentLength dst.contentLengthBytes = append(dst.contentLengthBytes[:0], h.contentLengthBytes...) @@ -786,7 +786,7 @@ func (h *ResponseHeader) Read(r *bufio.Reader) error { return nil } if err != errNeedMore { - h.Clear() + h.Reset() return err } n = r.Buffered() + 1 @@ -794,7 +794,7 @@ func (h *ResponseHeader) Read(r *bufio.Reader) error { } func (h *ResponseHeader) tryRead(r *bufio.Reader, n int) error { - h.Clear() + h.Reset() b, err := r.Peek(n) if len(b) == 0 { // treat all errors on the first byte read as EOF @@ -825,7 +825,7 @@ func (h *RequestHeader) Read(r *bufio.Reader) error { return nil } if err != errNeedMore { - h.Clear() + h.Reset() return err } n = r.Buffered() + 1 @@ -833,7 +833,7 @@ func (h *RequestHeader) Read(r *bufio.Reader) error { } func (h *RequestHeader) tryRead(r *bufio.Reader, n int) error { - h.Clear() + h.Reset() b, err := r.Peek(n) if len(b) == 0 { // treat all errors on the first byte read as EOF diff --git a/header_test.go b/header_test.go index 28285b6..e9728a7 100644 --- a/header_test.go +++ b/header_test.go @@ -376,7 +376,7 @@ func TestResponseHeaderCookie(t *testing.T) { c.Domain = []byte("foobar.com") h.SetCookie(&c) - c.Clear() + c.Reset() c.Key = []byte("foobar") if !h.GetCookie(&c) { t.Fatalf("Cannot find cookie %q", c.Key) diff --git a/http.go b/http.go index 83bac91..0e3a679 100644 --- a/http.go +++ b/http.go @@ -136,7 +136,7 @@ func (req *Request) SetBody(body []byte) { // CopyTo copies req contents to dst. func (req *Request) CopyTo(dst *Request) { - dst.Clear() + dst.Reset() req.Header.CopyTo(&dst.Header) dst.body = append(dst.body[:0], req.body...) if req.parsedURI { @@ -149,7 +149,7 @@ func (req *Request) CopyTo(dst *Request) { // CopyTo copies resp contents to dst except of BodyStream. func (resp *Response) CopyTo(dst *Response) { - dst.Clear() + dst.Reset() resp.Header.CopyTo(&dst.Header) dst.body = append(dst.body[:0], resp.body...) dst.SkipBody = resp.SkipBody @@ -192,23 +192,23 @@ func (req *Request) parsePostArgs() { return } -// Clear clears request contents. -func (req *Request) Clear() { - req.Header.Clear() +// Reset clears request contents. +func (req *Request) Reset() { + req.Header.Reset() req.clearSkipHeader() } func (req *Request) clearSkipHeader() { req.body = req.body[:0] - req.uri.Clear() + req.uri.Reset() req.parsedURI = false - req.postArgs.Clear() + req.postArgs.Reset() req.parsedPostArgs = false } -// Clear clears response contents. -func (resp *Response) Clear() { - resp.Header.Clear() +// Reset clears response contents. +func (resp *Response) Reset() { + resp.Header.Reset() resp.clearSkipHeader() } @@ -228,7 +228,7 @@ func (req *Request) Read(r *bufio.Reader) error { if req.Header.IsPost() { req.body, err = readBody(r, req.Header.ContentLength(), req.body) if err != nil { - req.Clear() + req.Reset() return err } req.Header.SetContentLength(len(req.body)) @@ -247,7 +247,7 @@ func (resp *Response) Read(r *bufio.Reader) error { if !isSkipResponseBody(resp.Header.StatusCode) && !resp.SkipBody { resp.body, err = readBody(r, resp.Header.ContentLength(), resp.body) if err != nil { - resp.Clear() + resp.Reset() return err } resp.Header.SetContentLength(len(resp.body)) diff --git a/http_test.go b/http_test.go index 72371bb..03fb6f4 100644 --- a/http_test.go +++ b/http_test.go @@ -55,7 +55,7 @@ func TestRequestWriteRequestURINoHost(t *testing.T) { } // verify that Request.Write returns error on non-absolute RequestURI - req.Clear() + req.Reset() req.Header.SetRequestURI("/foo/bar") w.Reset() bw.Reset(&w) diff --git a/server.go b/server.go index af28d0b..7ff8348 100644 --- a/server.go +++ b/server.go @@ -427,7 +427,7 @@ func (ctx *RequestCtx) RemoteIP() net.IP { // Error calls are ignored after TimeoutError call. func (ctx *RequestCtx) Error(msg string, statusCode int) { resp := &ctx.Response - resp.Clear() + resp.Reset() resp.Header.StatusCode = statusCode resp.Header.SetContentTypeBytes(defaultContentType) resp.body = AppendBytesStr(resp.body[:0], msg) @@ -741,7 +741,7 @@ func (s *Server) serveConn(c net.Conn) error { prevReadTime = currentTime ctx.time = currentTime - ctx.Response.Clear() + ctx.Response.Reset() s.Handler(ctx) errMsg = ctx.timeoutErrMsg if len(errMsg) > 0 { @@ -923,7 +923,7 @@ func (ctx *RequestCtx) Init(req *Request, remoteAddr net.Addr, logger Logger) { ctx.s = &fakeServer ctx.initID() req.CopyTo(&ctx.Request) - ctx.Response.Clear() + ctx.Response.Reset() ctx.serveConnRequestNum = 0 ctx.serveConnTime = time.Now() ctx.time = ctx.serveConnTime diff --git a/uri.go b/uri.go index 698162d..4084364 100644 --- a/uri.go +++ b/uri.go @@ -40,15 +40,15 @@ type URI struct { requestURI []byte } -// Clear clears uri. -func (x *URI) Clear() { +// Reset clears uri. +func (x *URI) Reset() { x.PathOriginal = x.PathOriginal[:0] x.Scheme = x.Scheme[:0] x.Host = x.Host[:0] x.Path = x.Path[:0] x.QueryString = x.QueryString[:0] x.Hash = x.Hash[:0] - x.queryArgs.Clear() + x.queryArgs.Reset() x.parsedQueryArgs = false x.fullURI = x.fullURI[:0] @@ -59,7 +59,7 @@ func (x *URI) Clear() { // // It is safe modifying host and uri buffers after the Parse call. func (x *URI) Parse(host, uri []byte) { - x.Clear() + x.Reset() scheme, host, uri := splitHostUri(host, uri) x.Scheme = append(x.Scheme, scheme...)