diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2016-10-22 09:47:05 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2016-10-22 19:44:53 +0000 |
| commit | b992c391d4aae64e147fc64c77ad41d61be8e2e7 (patch) | |
| tree | d29aba00374f9496d639f9b5e259aca14d9d734e /src/net/http/transfer.go | |
| parent | 448e1db103df7a9b29aa360f42fdcdc9b89fa399 (diff) | |
| download | go-b992c391d4aae64e147fc64c77ad41d61be8e2e7.tar.xz | |
net/http: add NoBody, don't return nil from NewRequest on zero bodies
This is an alternate solution to https://golang.org/cl/31445
Instead of making NewRequest return a request with Request.Body == nil
to signal a zero byte body, add a well-known variable that means
explicitly zero.
Too many tests inside Google (and presumably the outside world)
broke.
Change-Id: I78f6ecca8e8aa1e12179c234ccfb6bcf0ee29ba8
Reviewed-on: https://go-review.googlesource.com/31726
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
Diffstat (limited to 'src/net/http/transfer.go')
| -rw-r--r-- | src/net/http/transfer.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/http/transfer.go b/src/net/http/transfer.go index f34c703110..beafb7ac97 100644 --- a/src/net/http/transfer.go +++ b/src/net/http/transfer.go @@ -367,12 +367,12 @@ func readTransfer(msg interface{}, r *bufio.Reader) (err error) { switch { case chunked(t.TransferEncoding): if noBodyExpected(t.RequestMethod) { - t.Body = eofReader + t.Body = NoBody } else { t.Body = &body{src: internal.NewChunkedReader(r), hdr: msg, r: r, closing: t.Close} } case realLength == 0: - t.Body = eofReader + t.Body = NoBody case realLength > 0: t.Body = &body{src: io.LimitReader(r, realLength), closing: t.Close} default: @@ -382,7 +382,7 @@ func readTransfer(msg interface{}, r *bufio.Reader) (err error) { t.Body = &body{src: r, closing: t.Close} } else { // Persistent connection (i.e. HTTP/1.1) - t.Body = eofReader + t.Body = NoBody } } |
