Skip to content

G
golang
Commit 8cdd999b authored by Tw's avatar Tw Committed by Brad Fitzpatrick
Browse files
Options

net/http: don't set Content-Type with empty body automatically 

We set Content-Type to "text/plain; charset=utf-8" even with blank body
before. Let's strip this unnecessary header though it's harmless in most
cases.

Fixes #20784
Signed-off-by: 's avatarTw <tw19881113@gmail.com>

Change-Id: Ic58a410dcbc89f457c6ddd92961d9cbf545b2f4f
Reviewed-on: https://go-review.googlesource.com/46631
Run-TryBot: Emmanuel Odeke <emm.odeke@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: 's avatarBrad Fitzpatrick <bradfitz@golang.org>
parent bd926e1c
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 13 deletions
src/net/http/fs_test.go
View file @ 8cdd999b
......@@ -948,8 +948,7 @@ func TestServeContent(t *testing.T) {
reqHeader: map[string]string{
"If-Match": `"B"`,
},
wantStatus: 412,
wantContentType: "text/plain; charset=utf-8",
wantStatus: 412,
},
"ifmatch_fails_on_weak_etag": {
file: "testdata/style.css",
......@@ -957,8 +956,7 @@ func TestServeContent(t *testing.T) {
reqHeader: map[string]string{
"If-Match": `W/"A"`,
},
wantStatus: 412,
wantContentType: "text/plain; charset=utf-8",
wantStatus: 412,
},
"if_unmodified_since_true": {
file: "testdata/style.css",
......@@ -976,9 +974,8 @@ func TestServeContent(t *testing.T) {
reqHeader: map[string]string{
"If-Unmodified-Since": htmlModTime.Add(-2 * time.Second).UTC().Format(TimeFormat),
},
wantStatus: 412,
wantContentType: "text/plain; charset=utf-8",
wantLastMod: htmlModTime.UTC().Format(TimeFormat),
wantStatus: 412,
wantLastMod: htmlModTime.UTC().Format(TimeFormat),
},
}
for testName, tt := range tests {
......
src/net/http/h2_bundle.go
View file @ 8cdd999b
......@@ -6011,7 +6011,7 @@ func (rws *http2responseWriterState) writeChunk(p []byte) (n int, err error) {
clen = strconv.Itoa(len(p))
}
_, hasContentType := rws.snapHeader["Content-Type"]
if !hasContentType && http2bodyAllowedForStatus(rws.status) {
if !hasContentType && http2bodyAllowedForStatus(rws.status) && len(p) > 0 {
ctype = DetectContentType(p)
}
var date string
......
src/net/http/serve_test.go
View file @ 8cdd999b
......@@ -3439,9 +3439,6 @@ func TestHeaderToWire(t *testing.T) {
handler: func(rw ResponseWriter, r *Request) {
},
check: func(got string) error {
if !strings.Contains(got, "Content-Type: text/plain") {
return errors.New("wrong content-type; want text/plain")
}
if !strings.Contains(got, "Content-Length: 0") {
return errors.New("want 0 content-length")
}
......
src/net/http/server.go
View file @ 8cdd999b
......@@ -1311,7 +1311,7 @@ func (cw *chunkWriter) writeHeader(p []byte) {
if bodyAllowedForStatus(code) {
// If no content type, apply sniffing algorithm to body.
_, haveType := header["Content-Type"]
if !haveType && !hasTE {
if !haveType && !hasTE && len(p) > 0 {
setHeader.contentType = DetectContentType(p)
}
} else {
......
src/net/http/sniff_test.go
View file @ 8cdd999b
......@@ -23,7 +23,6 @@ var sniffTests = []struct {
contentType string
}{
// Some nonsense.
{"Empty", []byte{}, "text/plain; charset=utf-8"},
{"Binary", []byte{1, 2, 3}, "application/octet-stream"},
{"HTML document #1", []byte(`<HtMl><bOdY>blah blah blah</body></html>`), "text/html; charset=utf-8"},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment