From 3a08eec1f93eb6f659ceb6fdd17d8caeed1ee63b Mon Sep 17 00:00:00 2001 From: Pengfei Xue Date: Mon, 30 Dec 2013 11:29:35 +0800 Subject: [PATCH] simplify condition test for trailing / --- router.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/router.go b/router.go index d54576ec..cac3c82c 100644 --- a/router.go +++ b/router.go @@ -575,12 +575,11 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request) } // pattern /admin url /admin 200 /admin/ 200 // pattern /admin/ url /admin 301 /admin/ 200 - if requestPath[n-1] != '/' && len(route.pattern) == n+1 && - route.pattern[n] == '/' && route.pattern[:n] == requestPath { + if requestPath[n-1] != '/' && requestPath+"/" == route.pattern { http.Redirect(w, r, requestPath+"/", 301) goto Admin } - if requestPath[n-1] == '/' && n >= 2 && requestPath[:n-2] == route.pattern { + if requestPath[n-1] == '/' && route.pattern+"/" == requestPath { runMethod = p.getRunMethod(r.Method, context, route) if runMethod != "" { runrouter = route.controllerType