diff options
author | Andrew Gerrand <adg@golang.org> | 2010-06-30 17:56:51 +1000 |
---|---|---|
committer | Andrew Gerrand <adg@golang.org> | 2010-06-30 17:56:51 +1000 |
commit | 4f340f5051ea94d529b1fcd182f61b20b2b41e85 (patch) | |
tree | 26362d01816540b128aba1e6c7a039fde498eab7 | |
parent | 71675c6fa0ea50ec412076d140b8899ab13b95f3 (diff) | |
download | go-4f340f5051ea94d529b1fcd182f61b20b2b41e85.tar.gz go-4f340f5051ea94d529b1fcd182f61b20b2b41e85.zip |
godoc: canonicalize codewalk paths
R=rsc
CC=golang-dev
https://golang.org/cl/1729046
-rw-r--r-- | lib/godoc/codewalk.html | 2 | ||||
-rw-r--r-- | src/cmd/godoc/codewalk.go | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/godoc/codewalk.html b/lib/godoc/codewalk.html index 1ce6393ec6..47f8a22e2b 100644 --- a/lib/godoc/codewalk.html +++ b/lib/godoc/codewalk.html @@ -15,7 +15,7 @@ <div id="code-area"> <div id="code-header" align="center"> <a id="code-popout-link" href="" target="_blank"> - <img title="View code in new window" alt="Pop Out Code" src="popout.png" style="display: block; float: right;"/> + <img title="View code in new window" alt="Pop Out Code" src="/doc/codewalk/popout.png" style="display: block; float: right;"/> </a> <select id="code-selector"> {.repeated section File} diff --git a/src/cmd/godoc/codewalk.go b/src/cmd/godoc/codewalk.go index 412214b8f5..806849c00b 100644 --- a/src/cmd/godoc/codewalk.go +++ b/src/cmd/godoc/codewalk.go @@ -63,6 +63,11 @@ func codewalk(c *http.Conn, r *http.Request) { return } + // Canonicalize the path and redirect if changed + if redirect(c, r) { + return + } + b := applyTemplate(codewalkHTML, "codewalk", cw) servePage(c, "Codewalk: "+cw.Title, "", "", b) } |