net/http: fix text for ErrBodyReadAfterClose

Can happen in both request and response.
Also use it in one place that wasn't.

Fixes #3997.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/6903057

diff --git a/src/pkg/net/http/server.go b/src/pkg/net/http/server.go
index 53879c770fb70120195fbcb64646ca6aed757061..c4ddbec54f1ce86d806f4dcc64d683e96884c9ac 100644 (file)
--- a/src/pkg/net/http/server.go
+++ b/src/pkg/net/http/server.go
@@ -302,7 +302,7 @@ type expectContinueReader struct {
 
 func (ecr *expectContinueReader) Read(p []byte) (n int, err error) {
        if ecr.closed {
-               return 0, errors.New("http: Read after Close on request Body")
+               return 0, ErrBodyReadAfterClose
        }
        if !ecr.resp.wroteContinue && !ecr.resp.conn.hijacked() {
                ecr.resp.wroteContinue = true

diff --git a/src/pkg/net/http/transfer.go b/src/pkg/net/http/transfer.go
index 757a0ec4623b0ec0505fc23a134f20a40d7614c5..70ea15b8e4a346c8e255a102b0fb43347e80c104 100644 (file)
--- a/src/pkg/net/http/transfer.go
+++ b/src/pkg/net/http/transfer.go
@@ -534,11 +534,11 @@ type body struct {
        res *response // response writer for server requests, else nil
 }
 
-// ErrBodyReadAfterClose is returned when reading a Request Body after
-// the body has been closed. This typically happens when the body is
+// ErrBodyReadAfterClose is returned when reading a Request or Response
+// Body after the body has been closed. This typically happens when the body is
 // read after an HTTP Handler calls WriteHeader or Write on its
 // ResponseWriter.
-var ErrBodyReadAfterClose = errors.New("http: invalid Read on closed request Body")
+var ErrBodyReadAfterClose = errors.New("http: invalid Read on closed Body")
 
 func (b *body) Read(p []byte) (n int, err error) {
        if b.closed {