Store routes in a vector instead of a map. This gives the correct order of evaluation.

Michael Hoisie · Michael Hoisie · commit 9009d40d9a21 · 2010-04-23T10:54:24.000-07:00
diff --git a/status.go b/status.go
@@ -10,13 +10,13 @@ var statusText = map[int]string{
     http.StatusContinue:           "Continue",
     http.StatusSwitchingProtocols: "Switching Protocols",
 
-    http.StatusOK:       "OK",
-    http.StatusCreated:  "Created",
-    http.StatusAccepted: "Accepted",
+    http.StatusOK:                   "OK",
+    http.StatusCreated:              "Created",
+    http.StatusAccepted:             "Accepted",
     http.StatusNonAuthoritativeInfo: "Non-Authoritative Information",
-    http.StatusNoContent:      "No Content",
-    http.StatusResetContent:   "Reset Content",
-    http.StatusPartialContent: "Partial Content",
+    http.StatusNoContent:            "No Content",
+    http.StatusResetContent:         "Reset Content",
+    http.StatusPartialContent:       "Partial Content",
 
     http.StatusMultipleChoices:   "Multiple Choices",
     http.StatusMovedPermanently:  "Moved Permanently",
@@ -26,29 +26,29 @@ var statusText = map[int]string{
     http.StatusUseProxy:          "Use Proxy",
     http.StatusTemporaryRedirect: "Temporary Redirect",
 
-    http.StatusBadRequest:       "Bad Request",
-    http.StatusUnauthorized:     "Unauthorized",
-    http.StatusPaymentRequired:  "Payment Required",
-    http.StatusForbidden:        "Forbidden",
-    http.StatusNotFound:         "Not Found",
-    http.StatusMethodNotAllowed: "Method Not Allowed",
-    http.StatusNotAcceptable:    "Not Acceptable",
-    http.StatusProxyAuthRequired: "Proxy Authentication Required",
-    http.StatusRequestTimeout:        "Request Timeout",
-    http.StatusConflict:              "Conflict",
-    http.StatusGone:                  "Gone",
-    http.StatusLengthRequired:        "Length Required",
-    http.StatusPreconditionFailed:    "Precondition Failed",
-    http.StatusRequestEntityTooLarge: "Request Entity Too Large",
-    http.StatusRequestURITooLong:     "Request URI Too Long",
-    http.StatusUnsupportedMediaType:  "Unsupported Media Type",
+    http.StatusBadRequest:                   "Bad Request",
+    http.StatusUnauthorized:                 "Unauthorized",
+    http.StatusPaymentRequired:              "Payment Required",
+    http.StatusForbidden:                    "Forbidden",
+    http.StatusNotFound:                     "Not Found",
+    http.StatusMethodNotAllowed:             "Method Not Allowed",
+    http.StatusNotAcceptable:                "Not Acceptable",
+    http.StatusProxyAuthRequired:            "Proxy Authentication Required",
+    http.StatusRequestTimeout:               "Request Timeout",
+    http.StatusConflict:                     "Conflict",
+    http.StatusGone:                         "Gone",
+    http.StatusLengthRequired:               "Length Required",
+    http.StatusPreconditionFailed:           "Precondition Failed",
+    http.StatusRequestEntityTooLarge:        "Request Entity Too Large",
+    http.StatusRequestURITooLong:            "Request URI Too Long",
+    http.StatusUnsupportedMediaType:         "Unsupported Media Type",
     http.StatusRequestedRangeNotSatisfiable: "Requested Range Not Satisfiable",
-    http.StatusExpectationFailed: "Expectation Failed",
+    http.StatusExpectationFailed:            "Expectation Failed",
 
-    http.StatusInternalServerError: "Internal Server Error",
-    http.StatusNotImplemented:      "Not Implemented",
-    http.StatusBadGateway:          "Bad Gateway",
-    http.StatusServiceUnavailable:  "Service Unavailable",
-    http.StatusGatewayTimeout:      "Gateway Timeout",
+    http.StatusInternalServerError:     "Internal Server Error",
+    http.StatusNotImplemented:          "Not Implemented",
+    http.StatusBadGateway:              "Bad Gateway",
+    http.StatusServiceUnavailable:      "Service Unavailable",
+    http.StatusGatewayTimeout:          "Gateway Timeout",
     http.StatusHTTPVersionNotSupported: "HTTP Version Not Supported",
 }
diff --git a/web.go b/web.go
@@ -165,7 +165,7 @@ type route struct {
     handler *reflect.FuncValue
 }
 
-var routes = make(map[*regexp.Regexp]route)
+var routes vector.Vector
 
 func addRoute(r string, method string, handler interface{}) {
     cr, err := regexp.Compile(r)
@@ -174,7 +174,7 @@ func addRoute(r string, method string, handler interface{}) {
         return
     }
     fv := reflect.NewValue(handler).(*reflect.FuncValue)
-    routes[cr] = route{r, cr, method, fv}
+    routes.Push(route{r, cr, method, fv})
 }
 
 type httpConn struct {
@@ -250,7 +250,9 @@ func routeHandler(req *Request, c conn) {
     ctx.SetHeader("Content-Type", "text/html; charset=utf-8", true)
     ctx.SetHeader("Server", "web.go", true)
 
-    for cr, route := range routes {
+    for i := 0; i < routes.Len(); i++ {
+        route := routes.At(i).(route)
+        cr := route.cr
         //if the methods don't match, skip this handler (except HEAD can be used in place of GET)
         if req.Method != route.method && !(req.Method == "HEAD" && route.method == "GET") {
             continue
@@ -311,13 +313,13 @@ func routeHandler(req *Request, c conn) {
 
         return
     }
-    
+
     //try to serve index.html
     if indexPath := path.Join(staticDir, "index.html"); requestPath == "/" && fileExists(indexPath) {
-      serveFile(&ctx, indexPath)
-      return
+        serveFile(&ctx, indexPath)
+        return
     }
-    
+
     ctx.Abort(404, "Page not found")
 }
 
