Commit23f6bc5

committed

[release-branch.go1.3] net/http: fix double Content-Length in response

««« CL 105040043 / ef8878dbed3bnet/http: fix double Content-Length in responseFixes#8180LGTM=rscR=rscCC=golang-codereviewshttps://golang.org/cl/105040043»»»TBR=bradfitzR=golang-codereviewsCC=bradfitz, golang-codereviews, ianthttps://golang.org/cl/102300046

1 parent74183c5 commit23f6bc5Copy full SHA for 23f6bc5

File tree

+23

-2

lines changed

+23

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,10 @@ func (r *Response) Write(w io.Writer) error {`
`266`	`266`	`returnerr`
`267`	`267`	`}`
`268`	`268`
`269`		`-ifr1.ContentLength==0&&!chunked(r1.TransferEncoding) {`
	`269`	`+// contentLengthAlreadySent may have been already sent for`
	`270`	`+// POST/PUT requests, even if zero length. See Issue 8180.`
	`271`	`+contentLengthAlreadySent:=tw.shouldSendContentLength()`
	`272`	`+ifr1.ContentLength==0&&!chunked(r1.TransferEncoding)&&!contentLengthAlreadySent {`
`270`	`273`	`if_,err:=io.WriteString(w,"Content-Length: 0\r\n");err!=nil {`
`271`	`274`	`returnerr`
`272`	`275`	`}`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,22 @@ func TestResponseWrite(t *testing.T) {`
`191`	`191`	`"Foo: Bar Baz\r\n"+`
`192`	`192`	`"\r\n",`
`193`	`193`	`},`
	`194`	`+`
	`195`	`+// Want a single Content-Length header. Fixing issue 8180 where`
	`196`	`+// there were two.`
	`197`	`+{`
	`198`	`+Response{`
	`199`	`+StatusCode:StatusOK,`
	`200`	`+ProtoMajor:1,`
	`201`	`+ProtoMinor:1,`
	`202`	`+Request:&Request{Method:"POST"},`
	`203`	`+Header:Header{},`
	`204`	`+ContentLength:0,`
	`205`	`+TransferEncoding:nil,`
	`206`	`+Body:nil,`
	`207`	`+},`
	`208`	`+"HTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n",`
	`209`	`+},`
`194`	`210`	`}`
`195`	`211`
`196`	`212`	`fori:=rangerespWriteTests {`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,9 @@ func (t *transferWriter) WriteHeader(w io.Writer) error {`
`155`	`155`	`// function of the sanitized field triple (Body, ContentLength,`
`156`	`156`	`// TransferEncoding)`
`157`	`157`	`ift.shouldSendContentLength() {`
`158`		`-io.WriteString(w,"Content-Length: ")`
	`158`	`+if_,err:=io.WriteString(w,"Content-Length: ");err!=nil {`
	`159`	`+returnerr`
	`160`	`+}`
`159`	`161`	`if_,err:=io.WriteString(w,strconv.FormatInt(t.ContentLength,10)+"\r\n");err!=nil {`
`160`	`162`	`returnerr`
`161`	`163`	`}`

Comments

(0)