Allow http.Redirect to do both temporary (307) and permanent (301) redirects.

This also adds a missing 'return' when a malformed URL is passed to it.

R=rsc
APPROVED=rsc
DELTA=30  (13 added, 2 deleted, 15 changed)
OCL=28598
CL=28710

diff --git a/src/lib/http/fs.go b/src/lib/http/fs.go
index c1e0ee69996c4ec070c6d25a387f76ba4f17823d..108734c47f1796e6081c7029368bbab9969a323b 100644 (file)
--- a/src/lib/http/fs.go
+++ b/src/lib/http/fs.go
@@ -78,7 +78,7 @@ func serveFileInternal(c *Conn, r *Request, name string, redirect bool) {
        // redirect to strip off any index.html
        n := len(name) - len(indexPage);
        if n >= 0 && name[n:len(name)] == indexPage {
-               http.Redirect(c, name[0:n+1]);
+               http.Redirect(c, name[0:n+1], StatusMovedPermanently);
                return;
        }
 
@@ -103,12 +103,12 @@ func serveFileInternal(c *Conn, r *Request, name string, redirect bool) {
                url := r.Url.Path;
                if d.IsDirectory() {
                        if url[len(url)-1] != '/' {
-                               http.Redirect(c, url + "/");
+                               http.Redirect(c, url + "/", StatusMovedPermanently);
                                return;
                        }
                } else {
                        if url[len(url)-1] == '/' {
-                               http.Redirect(c, url[0:len(url)-1]);
+                               http.Redirect(c, url[0:len(url)-1], StatusMovedPermanently);
                                return;
                        }
                }

diff --git a/src/lib/http/server.go b/src/lib/http/server.go
index 9398351fe7b6fa63384eac69bb76a472620083c4..bdac8f188cfcff627a99541ec30190815435470e 100644 (file)
--- a/src/lib/http/server.go
+++ b/src/lib/http/server.go
@@ -278,12 +278,17 @@ func NotFoundHandler() Handler {
 
 // Redirect replies to the request with a redirect to url,
 // which may be a path relative to the request path.
-func Redirect(c *Conn, url string) {
+func Redirect(c *Conn, url string, code int) {
+       // RFC2616 recommends that a short note "SHOULD" be included in the
+       // response because older user agents may not understand 301/307.
+       note := "<a href=\"%v\">" + statusText[code] + "</a>.\n";
+       if c.Req.Method == "POST" {
+               note = "";
+       }
+
        u, err := ParseURL(url);
        if err != nil {
-               // TODO report internal error instead?
-               c.SetHeader("Location", url);
-               c.WriteHeader(StatusMovedPermanently);
+               goto finish
        }
 
        // If url was relative, make absolute by
@@ -322,20 +327,26 @@ func Redirect(c *Conn, url string) {
                }
        }
 
+finish:
        c.SetHeader("Location", url);
-       c.WriteHeader(StatusMovedPermanently);
+       c.WriteHeader(code);
+       fmt.Fprintf(c, note, url);
 }
 
 // Redirect to a fixed URL
-type redirectHandler string
-func (url redirectHandler) ServeHTTP(c *Conn, req *Request) {
-       Redirect(c, string(url));
+type redirectHandler struct {
+       url string;
+       code int;
+}
+func (rh *redirectHandler) ServeHTTP(c *Conn, req *Request) {
+       Redirect(c, rh.url, rh.code);
 }
 
 // RedirectHandler returns a request handler that redirects
-// each request it receives to the given url.
-func RedirectHandler(url string) Handler {
-       return redirectHandler(url);
+// each request it receives to the given url using the given
+// status code.
+func RedirectHandler(url string, code int) Handler {
+       return &redirectHandler{ url, code }
 }
 
 // ServeMux is an HTTP request multiplexer.
@@ -441,10 +452,10 @@ func (mux *ServeMux) Handle(pattern string, handler Handler) {
        mux.m[pattern] = handler;
 
        // Helpful behavior:
-       // If pattern is /tree/, insert redirect for /tree.
+       // If pattern is /tree/, insert permanent redirect for /tree.
        n := len(pattern);
        if n > 0 && pattern[n-1] == '/' {
-               mux.m[pattern[0:n-1]] = RedirectHandler(pattern);
+               mux.m[pattern[0:n-1]] = RedirectHandler(pattern, StatusMovedPermanently);
        }
 }
 

diff --git a/usr/gri/pretty/godoc.go b/usr/gri/pretty/godoc.go
index 4713c44417f771da1167fb2b16927b6bf438eedc..c7bf7cb1d801de9eb522c5e6225fd64bceb4442a 100644 (file)
--- a/usr/gri/pretty/godoc.go
+++ b/usr/gri/pretty/godoc.go
@@ -585,7 +585,7 @@ func servePkg(c *http.Conn, r *http.Request) {
        /*
        // TODO do we still need this?
        if r.Url.Path != Pkg + info.Path {
-               http.Redirect(c, info.Path);
+               http.Redirect(c, info.Path, http.StatusMovedPermanently);
                return;
        }
        */