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

http: do not edit Response.ContentLength in Response.Write

Browse Source 
R=rsc
CC=golang-dev
https://golang.org/cl/207061
This commit is contained in:
Petar Maymounkov 2010-02-18 23:38:17 -08:00 committed by Russ Cox
parent 80a14df122
commit e3b94edc03
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pkg/http/response.go
View File

@ -398,11 +398,12 @@ func (resp *Response) Write(w io.Writer) os.Error {
io.WriteString(w, strconv.Itoa(resp.StatusCode)+" "+text+"\r\n") io.WriteString(w, strconv.Itoa(resp.StatusCode)+" "+text+"\r\n")
// Sanitize the field triple (Body, ContentLength, TransferEncoding) // Sanitize the field triple (Body, ContentLength, TransferEncoding)
contentLength := resp.ContentLength
if noBodyExpected(resp.RequestMethod) { if noBodyExpected(resp.RequestMethod) {
resp.Body = nil resp.Body = nil
resp.TransferEncoding = nil resp.TransferEncoding = nil
// resp.ContentLength is expected to hold Content-Length // resp.ContentLength is expected to hold Content-Length
if resp.ContentLength < 0 { if contentLength < 0 {
return ErrMissingContentLength return ErrMissingContentLength
} }
} else { } else {
@ -410,9 +411,9 @@ func (resp *Response) Write(w io.Writer) os.Error {
resp.TransferEncoding = nil resp.TransferEncoding = nil
} }
if chunked(resp.TransferEncoding) { if chunked(resp.TransferEncoding) {
resp.ContentLength = -1 contentLength = -1
} else if resp.Body == nil { // no chunking, no body } else if resp.Body == nil { // no chunking, no body
resp.ContentLength = 0 contentLength = 0
} }
} }
@ -422,9 +423,9 @@ func (resp *Response) Write(w io.Writer) os.Error {
if chunked(resp.TransferEncoding) { if chunked(resp.TransferEncoding) {
io.WriteString(w, "Transfer-Encoding: chunked\r\n") io.WriteString(w, "Transfer-Encoding: chunked\r\n")
} else { } else {
if resp.ContentLength > 0 || resp.RequestMethod == "HEAD" { if contentLength > 0 || resp.RequestMethod == "HEAD" {
io.WriteString(w, "Content-Length: ") io.WriteString(w, "Content-Length: ")
io.WriteString(w, strconv.Itoa64(resp.ContentLength)+"\r\n") io.WriteString(w, strconv.Itoa64(contentLength)+"\r\n")
} }
} }
if resp.Header != nil { if resp.Header != nil {
@ -477,7 +478,7 @@ func (resp *Response) Write(w io.Writer) os.Error {
err = cw.Close() err = cw.Close()
} }
} else { } else {
_, err = io.Copy(w, io.LimitReader(resp.Body, resp.ContentLength)) _, err = io.Copy(w, io.LimitReader(resp.Body, contentLength))
} }
if err != nil { if err != nil {
return err return err