lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 17:30:56 +00:00
Code Issues Releases Activity

Merge pull request #422 from pengfei-xue/devel

Browse Source 
simplify condition test for trailing /
This commit is contained in:
astaxie 2013-12-30 04:58:50 -08:00
commit a1e29b0b75
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
router.go
View File

@ -583,12 +583,11 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
} }
// pattern /admin url /admin 200 /admin/ 200 // 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] != '/' && requestPath+"/" == route.pattern {
route.pattern[n] == '/' && route.pattern[:n] == requestPath {
http.Redirect(w, r, requestPath+"/", 301) http.Redirect(w, r, requestPath+"/", 301)
goto Admin 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) runMethod = p.getRunMethod(r.Method, context, route)
if runMethod != "" { if runMethod != "" {
runrouter = route.controllerType runrouter = route.controllerType