From 429d60e13a73dc4ab809eb34e072a48a9ae80670 Mon Sep 17 00:00:00 2001
From: Aliaksandr Valialkin <valyala@gmail.com>
Date: Wed, 11 Nov 2015 16:44:53 +0200
Subject: [PATCH] ErrReadTimeout -> ErrTimeout

---
 http.go      | 18 +++++++++---------
 http_test.go |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/http.go b/http.go
index 284d2bf..25e335d 100644
--- a/http.go
+++ b/http.go
@@ -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
diff --git a/http_test.go b/http_test.go
index 6f99c74..7b398d9 100644
--- a/http_test.go
+++ b/http_test.go
@@ -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{}
 }