mirror of
https://github.com/golang/go
synced 2024-11-21 21:54:40 -07:00
http: avoid panic caused by nil URL
The current code will panic if an invalid request (one with a nil URL) is passed to the doFollowingRedirects function. Also, remove a redundant nil Header check. R=bradfitz CC=golang-dev https://golang.org/cl/5270046
This commit is contained in:
parent
c5b3a4fb07
commit
b5077f82fa
@ -115,9 +115,6 @@ func send(req *Request, t RoundTripper) (resp *Response, err os.Error) {
|
||||
|
||||
info := req.URL.RawUserinfo
|
||||
if len(info) > 0 {
|
||||
if req.Header == nil {
|
||||
req.Header = make(Header)
|
||||
}
|
||||
req.Header.Set("Authorization", "Basic "+base64.URLEncoding.EncodeToString([]byte(info)))
|
||||
}
|
||||
return t.RoundTrip(req)
|
||||
@ -176,6 +173,10 @@ func (c *Client) doFollowingRedirects(ireq *Request) (r *Response, err os.Error)
|
||||
}
|
||||
var via []*Request
|
||||
|
||||
if ireq.URL == nil {
|
||||
return nil, os.NewError("http: nil Request.URL")
|
||||
}
|
||||
|
||||
req := ireq
|
||||
urlStr := "" // next relative or absolute URL to fetch (after first request)
|
||||
for redirect := 0; ; redirect++ {
|
||||
|
Loading…
Reference in New Issue
Block a user