code review 4626067: http: add StripPrefix handler wrapper

src/pkg/http/server.go

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // HTTP server.  See RFC 2616.
 
 // TODO(rsc):
 //      logging
 
 package http
@@ skipping 134 matching lines @@
 func newConn(rwc net.Conn, handler Handler) (c *conn, err os.Error) {
         c = new(conn)
         c.remoteAddr = rwc.RemoteAddr().String()
         c.handler = handler
         c.rwc = rwc
         br := bufio.NewReader(rwc)
         bw := bufio.NewWriter(rwc)
         c.buf = bufio.NewReadWriter(br, bw)
 
         if tlsConn, ok := rwc.(*tls.Conn); ok {
+                tlsConn.Handshake()
                 c.tlsState = new(tls.ConnectionState)
                 *c.tlsState = tlsConn.ConnectionState()
         }
 
         return c, nil
 }
 
 // wrapper around io.ReaderCloser which on first read, sends an
 // HTTP/1.1 100 Continue header
 type expectContinueReader struct {
@@ skipping 419 matching lines @@
         fmt.Fprintln(w, error)
 }
 
 // NotFound replies to the request with an HTTP 404 not found error.
 func NotFound(w ResponseWriter, r *Request) { Error(w, "404 page not found", StatusNotFound) }
 
 // NotFoundHandler returns a simple request handler
 // that replies to each request with a ``404 page not found'' reply.
 func NotFoundHandler() Handler { return HandlerFunc(NotFound) }
 
-// StripHandler returns a Handler that strips a given prefix
-// from the request URL path and calls the provided Handler
-// with the modified Request. If a request doesn't start
-// with the prefix, an HTTP 404 not found error is returned.
-func StripHandler(h Handler, prefix string) Handler {
+// StripPrefix returns a handler that serves HTTP requests
+// by removing the given prefix from the request URL's Path
+// and invoking the handler h. StripPrefix handles a
+// request for a path that doesn't begin with prefix by
+// replying with an HTTP 404 not found error.
+func StripPrefix(prefix string, h Handler) Handler {
         return HandlerFunc(func(w ResponseWriter, r *Request) {
                 if !strings.HasPrefix(r.URL.Path, prefix) {
-                        Error(w, "404 page not found", StatusNotFound)
+                        NotFound(w, r)
                         return
                 }
                 r.URL.Path = r.URL.Path[len(prefix):]
-                r.URL.RawPath = r.URL.RawPath[len(prefix):]
                 h.ServeHTTP(w, r)
         })
 }
 
 // Redirect replies to the request with a redirect to url,
 // which may be a path relative to the request path.
 func Redirect(w ResponseWriter, r *Request, url string, code int) {
         if u, err := ParseURL(url); err == nil {
                 // If url was relative, make absolute by
                 // combining with request path.
@@ skipping 453 matching lines @@
 func (tw *timeoutWriter) WriteHeader(code int) {
         tw.mu.Lock()
         if tw.timedOut || tw.wroteHeader {
                 tw.mu.Unlock()
                 return
         }
         tw.wroteHeader = true
         tw.mu.Unlock()
         tw.w.WriteHeader(code)
 }