diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2011-03-23 14:29:26 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2011-03-23 14:29:26 -0700 |
| commit | 9d3b39986cd5ac5158412bdb2d61275262796a4d (patch) | |
| tree | 228ea8c114720647ec34f068ac1419e27c6afa8a /src/pkg/http/server.go | |
| parent | 054a0c338f59b792439d1de9629ad82409987418 (diff) | |
| download | go-9d3b39986cd5ac5158412bdb2d61275262796a4d.tar.xz | |
http: don't chunk 304 responses
rsc's earlier fix, plus tests.
R=rsc
CC=golang-dev
https://golang.org/cl/4285062
Diffstat (limited to 'src/pkg/http/server.go')
| -rw-r--r-- | src/pkg/http/server.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/pkg/http/server.go b/src/pkg/http/server.go index 91caebc2db..8e7039371a 100644 --- a/src/pkg/http/server.go +++ b/src/pkg/http/server.go @@ -251,10 +251,9 @@ func (w *response) WriteHeader(code int) { hasCL = false } - if w.req.Method == "HEAD" { + if w.req.Method == "HEAD" || code == StatusNotModified { // do nothing } else if hasCL { - w.chunking = false w.contentLength = contentLength w.header.Del("Transfer-Encoding") } else if w.req.ProtoAtLeast(1, 1) { @@ -270,7 +269,6 @@ func (w *response) WriteHeader(code int) { // encoding and we don't know the Content-Length so // signal EOF by closing connection. w.closeAfterReply = true - w.chunking = false // redundant w.header.Del("Transfer-Encoding") // in case already set } |