Commit 8db6370d authored by Rob Pike's avatar Rob Pike

fix final program to have Html->HTML

R=rsc
CC=go-dev
https://golang.org/cl/152050
parent 6672eb37
...@@ -2394,7 +2394,7 @@ import ( ...@@ -2394,7 +2394,7 @@ import (
var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18 var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18
var fmap = template.FormatterMap{ var fmap = template.FormatterMap{
"html": template.HtmlFormatter, "html": template.HTMLFormatter,
"url+html": UrlHtmlFormatter, "url+html": UrlHtmlFormatter,
} }
var templ = template.MustParse(templateStr, fmap) var templ = template.MustParse(templateStr, fmap)
...@@ -2413,7 +2413,7 @@ func QR(c *http.Conn, req *http.Request) { ...@@ -2413,7 +2413,7 @@ func QR(c *http.Conn, req *http.Request) {
} }
func UrlHtmlFormatter(w io.Writer, v interface{}, fmt string) { func UrlHtmlFormatter(w io.Writer, v interface{}, fmt string) {
template.HtmlEscape(w, strings.Bytes(http.URLEscape(v.(string)))); template.HTMLEscape(w, strings.Bytes(http.URLEscape(v.(string))));
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment