net/http: fix whitespace handling in sniffer.

A single character typo ("\n" instead of "\r") meant that HTML data using DOS line breaks (CRLF) was not detected as HTML. R=golang-dev, adg CC=golang-dev https://golang.org/cl/5365041

net/http: fix whitespace handling in sniffer.
A single character typo ("\n" instead of "\r") meant that HTML data using DOS line breaks (CRLF) was not detected as HTML. R=golang-dev, adg CC=golang-dev https://golang.org/cl/5365041
75af79b9 · David Symonds · 603d80c2 · 75af79b9 · 75af79b9
Commit 75af79b9 authored Nov 07, 2011 by David Symonds
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

sniff.go src/pkg/net/http/sniff.go +1 -1

sniff_test.go src/pkg/net/http/sniff_test.go +1 -0

No files found.
--- a/src/pkg/net/http/sniff.go
+++ b/src/pkg/net/http/sniff.go
@@ -38,7 +38,7 @@ func DetectContentType(data []byte) string {
 }

 func isWS(b byte) bool {
-	return bytes.IndexByte([]byte("\t\n\x0C\n "), b) != -1
+	return bytes.IndexByte([]byte("\t\n\x0C\r "), b) != -1
 }

 type sniffSig interface {

--- a/src/pkg/net/http/sniff_test.go
+++ b/src/pkg/net/http/sniff_test.go
@@ -26,6 +26,7 @@ var sniffTests = []struct {
 	{"HTML document #1", []byte(`<HtMl><bOdY>blah blah blah</body></html>`), "text/html; charset=utf-8"},
 	{"HTML document #2", []byte(`<HTML></HTML>`), "text/html; charset=utf-8"},
 	{"HTML document #3 (leading whitespace)", []byte(`   <!DOCTYPE HTML>...`), "text/html; charset=utf-8"},
+	{"HTML document #4 (leading CRLF)", []byte("\r\n<html>..."), "text/html; charset=utf-8"},

 	{"Plain text", []byte(`This is not HTML. It has ☃ though.`), "text/plain; charset=utf-8"},