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

http: increase header line limit, let req.Host override req.URL.Host

Browse Source 
Fixes #566.

R=rsc
CC=golang-dev
https://golang.org/cl/194074
This commit is contained in:
Petar Maymounkov 2010-01-29 16:51:42 -08:00 committed by Russ Cox
parent bf57520e1c
commit 84f9b70280
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,8 +22,8 @@ import (
) )
const ( const (
maxLineLength = 1024 // assumed < bufio.DefaultBufSize maxLineLength = 4096 // assumed <= bufio.defaultBufSize
maxValueLength = 1024 maxValueLength = 4096
maxHeaderLines = 1024 maxHeaderLines = 1024
chunkSize = 4 << 10 // 4 KB chunks chunkSize = 4 << 10 // 4 KB chunks
) )
@ -128,6 +128,7 @@ const defaultUserAgent = "Go http package"
// Write writes an HTTP/1.1 request -- header and body -- in wire format. // Write writes an HTTP/1.1 request -- header and body -- in wire format.
// This method consults the following fields of req: // This method consults the following fields of req:
// Host
// URL // URL
// Method (defaults to "GET") // Method (defaults to "GET")
// UserAgent (defaults to defaultUserAgent) // UserAgent (defaults to defaultUserAgent)
@ -138,13 +139,18 @@ 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 {
host := req.Host
if host == "" {
host = req.URL.Host
}
uri := urlEscape(req.URL.Path, false) uri := urlEscape(req.URL.Path, false)
if req.URL.RawQuery != "" { if req.URL.RawQuery != "" {
uri += "?" + req.URL.RawQuery uri += "?" + req.URL.RawQuery
} }
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)
fmt.Fprintf(w, "Host: %s\r\n", req.URL.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 != "" {
@ -507,8 +513,9 @@ func ReadRequest(b *bufio.Reader) (req *Request, err os.Error) {
// GET http://www.google.com/index.html HTTP/1.1 // GET http://www.google.com/index.html HTTP/1.1
// Host: doesntmatter // Host: doesntmatter
// the same. In the second case, any Host line is ignored. // the same. In the second case, any Host line is ignored.
req.Host = req.URL.Host
if v, present := req.Header["Host"]; present { if v, present := req.Header["Host"]; present {
if req.URL.Host == "" { if req.Host == "" {
req.Host = v req.Host = v
} }
req.Header["Host"] = "", false req.Header["Host"] = "", false