From: Rob Pike <r@golang.org>
Date: Mon, 1 Feb 2010 06:17:25 +0000 (+1100)
Subject: Fix redirection if the page is in a subdirectory.
X-Git-Tag: weekly.2010-02-04~50
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=20195bbe6170f604d4067db1297774e45cda905e;p=gostls13.git

Fix redirection if the page is in a subdirectory.
Fixes buggy links in the devel subdirectory.
Code from rsc; tested by me.

R=rsc, gri
CC=golang-dev
https://golang.org/cl/197041
---

diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 812d23824e..0ec85991e5 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -995,6 +995,9 @@ func serveFile(c *http.Conn, r *http.Request) {
 	}
 
 	if dir != nil && dir.IsDirectory() {
+		if redirect(c, r) {
+			return
+		}
 		if index := path + "/index.html"; isTextFile(index) {
 			serveHTMLDoc(c, r, index)
 			return