diff options
| author | Ondřej Surý <ondrej@sury.org> | 2012-05-02 15:44:55 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2012-05-02 15:44:55 +0200 |
| commit | 62e7d56f2c8706e5b88221cedac6769863ddf3b0 (patch) | |
| tree | a48f46e27c9136335f8ab4db2da790556816554e /src/pkg/net/http/server.go | |
| parent | 37370279cdb95edc1ebb298a957147c907907988 (diff) | |
| parent | 0003ee229fd33ff46cb5f2fe1e35f5c0284debc4 (diff) | |
| download | golang-62e7d56f2c8706e5b88221cedac6769863ddf3b0.tar.gz | |
Merge commit 'upstream/1.0.1' into debian-sid
Diffstat (limited to 'src/pkg/net/http/server.go')
| -rw-r--r-- | src/pkg/net/http/server.go | 6 |
1 files changed, 4 insertions, 2 deletions
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( "&", "&", "<", "<", ">", ">", - `"`, """, - "'", "'", + // """ is shorter than """. + `"`, """, + // "'" is shorter than "'" and apos was not in HTML until HTML5. + "'", "'", ) func htmlEscape(s string) string { |