diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2015-12-17 19:36:43 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2015-12-17 20:21:44 +0000 |
| commit | 18227bb7b6ce14c2736543777f1d5cebeff11abd (patch) | |
| tree | 6d3444eb85c0612b0324d3b6a535e16d3382f8cb /src/net/http/request.go | |
| parent | 761ac75a948e14fcd8472684effedf75f3fc316e (diff) | |
| download | go-18227bb7b6ce14c2736543777f1d5cebeff11abd.tar.xz | |
net/http: be more consistent about Request.Method "" vs "GET"
Patch from Russ.
No bug identified, but I didn't search exhaustively. The new code is
easier to read.
Fixes #13621
Change-Id: Ifda936e4101116fa254ead950b5fe06adb14e977
Reviewed-on: https://go-review.googlesource.com/17981
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Russ Cox <rsc@golang.org>
Diffstat (limited to 'src/net/http/request.go')
| -rw-r--r-- | src/net/http/request.go | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/net/http/request.go b/src/net/http/request.go index 01575f33a5..d706d8e1b6 100644 --- a/src/net/http/request.go +++ b/src/net/http/request.go @@ -1057,11 +1057,13 @@ func (r *Request) closeBody() { } func (r *Request) isReplayable() bool { - return r.Body == nil && - (r.Method == "GET" || - r.Method == "HEAD" || - r.Method == "OPTIONS" || - r.Method == "TRACE") + if r.Body == nil { + switch valueOrDefault(r.Method, "GET") { + case "GET", "HEAD", "OPTIONS", "TRACE": + return true + } + } + return false } func validHostHeader(h string) bool { |