1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-26 03:11:30 +00:00

Merge commit '7a3d05ebf3fd36ea7e534de64ad38c23367ac97f'

This commit is contained in:
傅小黑 2013-12-30 11:37:20 +08:00
commit 3118c6c23f

View File

@ -573,13 +573,21 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
break break
} }
} }
// pattern /admin url /admin 200 /admin/ 404 // pattern /admin url /admin 200 /admin/ 200
// pattern /admin/ url /admin 301 /admin/ 200 // pattern /admin/ url /admin 301 /admin/ 200
if requestPath[n-1] != '/' && len(route.pattern) == n+1 && if requestPath[n-1] != '/' && len(route.pattern) == n+1 &&
route.pattern[n] == '/' && route.pattern[:n] == requestPath { route.pattern[n] == '/' && route.pattern[:n] == requestPath {
http.Redirect(w, r, requestPath+"/", 301) http.Redirect(w, r, requestPath+"/", 301)
goto Admin goto Admin
} }
if n >= 1 && requestPath[:n-1] == route.pattern {
runMethod = p.getRunMethod(r.Method, context, route)
if runMethod != "" {
runrouter = route.controllerType
findrouter = true
break
}
}
} }
//find regex's router //find regex's router