qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 14:08:37 -07:00
Code Releases Activity

Wrap kludge text in HTML comments so the text/html output will remain valid HTML.

Browse Source 
Be more conservative: only mess with text/html and text/plain output.

R=rsc
APPROVED=rsc
DELTA=20  (12 added, 5 deleted, 3 changed)
OCL=33806
CL=33812
This commit is contained in:
David Symonds 2009-08-24 17:31:35 -07:00
parent fdc4b4a47f
commit 429157848f
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/pkg/http/server.go
View File

@ -209,11 +209,6 @@ func errorKludge(c *Conn, req *Request) {
return; return;
} }
// Is it text? ("Content-Type" is always in the map)
if s := c.header["Content-Type"]; len(s) < 5 || s[0:5] != "text/" {
return;
}
// Is it a broken browser? // Is it a broken browser?
var msg string; var msg string;
switch agent := req.UserAgent; { switch agent := req.UserAgent; {
@ -225,9 +220,21 @@ func errorKludge(c *Conn, req *Request) {
return; return;
} }
msg += " would ignore this error page if this text weren't here.\n"; msg += " would ignore this error page if this text weren't here.\n";
io.WriteString(c, "\n");
for c.written < min { // Is it text? ("Content-Type" is always in the map)
io.WriteString(c, msg); baseType := strings.Split(c.header["Content-Type"], ";", 2)[0];
switch baseType {
case "text/html":
io.WriteString(c, "<!-- ");
for c.written < min {
io.WriteString(c, msg);
}
io.WriteString(c, " -->");
case "text/plain":
io.WriteString(c, "\n");
for c.written < min {
io.WriteString(c, msg);
}
} }
} }