qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-20 10:44:41 -07:00
Code Releases Activity

http: send full URL in proxy requests

Browse Source 
Fixes #53.  (again)

R=agl1
CC=golang-dev
https://golang.org/cl/4167054
This commit is contained in:
Russ Cox 2011-02-17 17:14:50 -05:00
parent f80d002438
commit 063125dfcf
2 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/pkg/http/client.go
View File

@ -92,19 +92,25 @@ func send(req *Request) (resp *Response, err os.Error) {
var proxyURL *URL var proxyURL *URL
proxyAuth := "" proxyAuth := ""
proxy := os.Getenv("HTTP_PROXY") proxy := ""
if !matchNoProxy(addr) {
proxy = os.Getenv("HTTP_PROXY")
if proxy == "" { if proxy == "" {
proxy = os.Getenv("http_proxy") proxy = os.Getenv("http_proxy")
} }
if matchNoProxy(addr) {
proxy = ""
} }
if proxy != "" { if proxy != "" {
proxyURL, err = ParseURL(proxy) proxyURL, err = ParseRequestURL(proxy)
if err != nil { if err != nil {
return nil, os.ErrorString("invalid proxy address") return nil, os.ErrorString("invalid proxy address")
} }
if proxyURL.Host == "" {
proxyURL, err = ParseRequestURL("http://" + proxy)
if err != nil {
return nil, os.ErrorString("invalid proxy address")
}
}
addr = proxyURL.Host addr = proxyURL.Host
proxyInfo := proxyURL.RawUserinfo proxyInfo := proxyURL.RawUserinfo
if proxyInfo != "" { if proxyInfo != "" {

20
src/pkg/http/request.go
View File

@ -184,6 +184,17 @@ const defaultUserAgent = "Go http package"
// If Body is present, Write forces "Transfer-Encoding: chunked" as a header // If Body is present, Write forces "Transfer-Encoding: chunked" as a header
// and then closes Body when finished sending it. // and then closes Body when finished sending it.
func (req *Request) Write(w io.Writer) os.Error { func (req *Request) Write(w io.Writer) os.Error {
return req.write(w, false)
}
// WriteProxy is like Write but writes the request in the form
// expected by an HTTP proxy. It includes the scheme and host
// name in the URI instead of using a separate Host: header line.
func (req *Request) WriteProxy(w io.Writer) os.Error {
return req.write(w, true)
}
func (req *Request) write(w io.Writer, usingProxy bool) os.Error {
host := req.Host host := req.Host
if host == "" { if host == "" {
host = req.URL.Host host = req.URL.Host
@ -197,10 +208,19 @@ func (req *Request) Write(w io.Writer) os.Error {
} }
} }
if usingProxy {
if uri == "" || uri[0] != '/' {
uri = "/" + uri
}
uri = req.URL.Scheme + "://" + host + uri
}
fmt.Fprintf(w, "%s %s HTTP/1.1\r\n", valueOrDefault(req.Method, "GET"), uri) fmt.Fprintf(w, "%s %s HTTP/1.1\r\n", valueOrDefault(req.Method, "GET"), uri)
// Header lines // Header lines
if !usingProxy {
fmt.Fprintf(w, "Host: %s\r\n", host) fmt.Fprintf(w, "Host: %s\r\n", host)
}
fmt.Fprintf(w, "User-Agent: %s\r\n", valueOrDefault(req.UserAgent, defaultUserAgent)) fmt.Fprintf(w, "User-Agent: %s\r\n", valueOrDefault(req.UserAgent, defaultUserAgent))
if req.Referer != "" { if req.Referer != "" {
fmt.Fprintf(w, "Referer: %s\r\n", req.Referer) fmt.Fprintf(w, "Referer: %s\r\n", req.Referer)