From: David Symonds <dsymonds@golang.org>
Date: Thu, 21 Jul 2011 12:20:09 +0000 (+1000)
Subject: http: disable sniffer for now.
X-Git-Tag: weekly.2011-07-29~102
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=6c46afdf413582f37ddebdb6b53923ef2a299610;p=gostls13.git

http: disable sniffer for now.

Something is broken, and investigation is underway.
In the meantime, godoc is broken, so disable sniffing for now
by reverting to the pre-sniffer state.

R=r
CC=golang-dev
https://golang.org/cl/4809046
---

diff --git a/src/pkg/http/server.go b/src/pkg/http/server.go
index dd4547c25f..b3fb8e101c 100644
--- a/src/pkg/http/server.go
+++ b/src/pkg/http/server.go
@@ -255,7 +255,9 @@ func (w *response) WriteHeader(code int) {
 	} else {
 		// If no content type, apply sniffing algorithm to body.
 		if w.header.Get("Content-Type") == "" {
-			w.needSniff = true
+			// NOTE(dsymonds): the sniffing mechanism in this file is currently broken.
+			//w.needSniff = true
+			w.header.Set("Content-Type", "text/html; charset=utf-8")
 		}
 	}