From 0003ee229fd33ff46cb5f2fe1e35f5c0284debc4 Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 2 May 2012 15:44:51 +0200
Subject: Imported Upstream version 1.0.1

---
 src/pkg/net/http/server.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/pkg/net/http/server.go')

diff --git a/src/pkg/net/http/server.go b/src/pkg/net/http/server.go
index 228ac4019..924ffd348 100644
--- a/src/pkg/net/http/server.go
+++ b/src/pkg/net/http/server.go
@@ -785,8 +785,10 @@ var htmlReplacer = strings.NewReplacer(
 	"&", "&amp;",
 	"<", "&lt;",
 	">", "&gt;",
-	`"`, "&quot;",
-	"'", "&apos;",
+	// "&#34;" is shorter than "&quot;".
+	`"`, "&#34;",
+	// "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
+	"'", "&#39;",
 )
 
 func htmlEscape(s string) string {
-- 
cgit v1.2.3