contrib/fasthttp
1
0
Fork 0
mirror of https://github.com/valyala/fasthttp.git synced 2026-06-16 16:17:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

ErrReadTimeout -> ErrTimeout

Browse Source
This commit is contained in:
Aliaksandr Valialkin
2015-11-11 16:44:53 +02:00
parent a4e8e226ff
commit 429d60e13a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
http.go
+9 -9
View File
@@ -142,16 +142,16 @@ func (resp *Response) clearSkipHeader() {
resp.BodyStream = nil
}
// ErrReadTimeout may be returned by Request.ReadTimeout
// or Response.ReadTimeout on timeout.
var ErrReadTimeout = errors.New("read timeout")
// ErrTimeout may be returned by Request.ReadTimeout,
// Response.ReadTimeout or HostClient.DoTimeout on timeout.
var ErrTimeout = errors.New("timeout")
// ReadTimeout reads request (including body) from the given r during
// the given timeout.
//
// If request couldn't be read during the given timeout,
// ErrReadTimeout is returned.
// Request can no longer be used after ErrReadTimeout error.
// ErrTimeout is returned.
// Request can no longer be used after ErrTimeout error.
func (req *Request) ReadTimeout(r *bufio.Reader, timeout time.Duration) error {
if timeout <= 0 {
return req.Read(r)
@@ -175,7 +175,7 @@ func (req *Request) ReadTimeout(r *bufio.Reader, timeout time.Duration) error {
case err = <-ch:
case <-req.timeoutTimer.C:
req.timeoutCh = nil
err = ErrReadTimeout
err = ErrTimeout
}
stopTimer(req.timeoutTimer)
return err
@@ -185,8 +185,8 @@ func (req *Request) ReadTimeout(r *bufio.Reader, timeout time.Duration) error {
// the given timeout.
//
// If response couldn't be read during the given timeout,
// ErrReadTimeout is returned.
// Request can no longer be used after ErrReadTimeout error.
// ErrTimeout is returned.
// Request can no longer be used after ErrTimeout error.
func (resp *Response) ReadTimeout(r *bufio.Reader, timeout time.Duration) error {
if timeout <= 0 {
return resp.Read(r)
@@ -210,7 +210,7 @@ func (resp *Response) ReadTimeout(r *bufio.Reader, timeout time.Duration) error
case err = <-ch:
case <-resp.timeoutTimer.C:
resp.timeoutCh = nil
err = ErrReadTimeout
err = ErrTimeout
}
stopTimer(resp.timeoutTimer)
return err
http_test.go
+4 -4
View File
@@ -109,8 +109,8 @@ func testResponseReadTimeoutError(t *testing.T, resp **Response) {
if err == nil {
t.Fatalf("Expecting error")
}
if err != ErrReadTimeout {
t.Fatalf("Unexpected error: %s. Expecting %s", err, ErrReadTimeout)
if err != ErrTimeout {
t.Fatalf("Unexpected error: %s. Expecting %s", err, ErrTimeout)
}
*resp = &Response{}
}
@@ -122,8 +122,8 @@ func testRequestReadTimeoutError(t *testing.T, req **Request) {
if err == nil {
t.Fatalf("Expecting error")
}
if err != ErrReadTimeout {
t.Fatalf("Unexpected error: %s. Expecting %s", err, ErrReadTimeout)
if err != ErrTimeout {
t.Fatalf("Unexpected error: %s. Expecting %s", err, ErrTimeout)
}
*req = &Request{}
}