diff options
Diffstat (limited to 'libgo/go/net/http/client.go')
| -rw-r--r-- | libgo/go/net/http/client.go | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/libgo/go/net/http/client.go b/libgo/go/net/http/client.go index 89441424e1d..02891db9adc 100644 --- a/libgo/go/net/http/client.go +++ b/libgo/go/net/http/client.go @@ -33,10 +33,11 @@ type Client struct { // CheckRedirect specifies the policy for handling redirects. // If CheckRedirect is not nil, the client calls it before - // following an HTTP redirect. The arguments req and via - // are the upcoming request and the requests made already, - // oldest first. If CheckRedirect returns an error, the client - // returns that error (wrapped in a url.Error) instead of + // following an HTTP redirect. The arguments req and via are + // the upcoming request and the requests made already, oldest + // first. If CheckRedirect returns an error, the Client's Get + // method returns both the previous Response and + // CheckRedirect's error (wrapped in a url.Error) instead of // issuing the Request req. // // If CheckRedirect is nil, the Client uses its default policy, @@ -95,7 +96,7 @@ type readClose struct { // // When err is nil, resp always contains a non-nil resp.Body. // -// Callers should close res.Body when done reading from it. If +// Callers should close resp.Body when done reading from it. If // resp.Body is not closed, the Client's underlying RoundTripper // (typically Transport) may not be able to re-use a persistent TCP // connection to the server for a subsequent "keep-alive" request. @@ -221,6 +222,7 @@ func (c *Client) doFollowingRedirects(ireq *Request) (resp *Response, err error) req := ireq urlStr := "" // next relative or absolute URL to fetch (after first request) + redirectFailed := false for redirect := 0; ; redirect++ { if redirect != 0 { req = new(Request) @@ -239,6 +241,7 @@ func (c *Client) doFollowingRedirects(ireq *Request) (resp *Response, err error) err = redirectChecker(req, via) if err != nil { + redirectFailed = true break } } @@ -268,16 +271,24 @@ func (c *Client) doFollowingRedirects(ireq *Request) (resp *Response, err error) return } - if resp != nil { - resp.Body.Close() - } - method := ireq.Method - return nil, &url.Error{ + urlErr := &url.Error{ Op: method[0:1] + strings.ToLower(method[1:]), URL: urlStr, Err: err, } + + if redirectFailed { + // Special case for Go 1 compatibility: return both the response + // and an error if the CheckRedirect function failed. + // See http://golang.org/issue/3795 + return resp, urlErr + } + + if resp != nil { + resp.Body.Close() + } + return nil, urlErr } func defaultCheckRedirect(req *Request, via []*Request) error { |