Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
235d2740
Commit
235d2740
authored
Dec 20, 2013
by
astaxie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #397 from pengfei-xue/devel
fix routing bug
parents
7aa307bd
00020139
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
router.go
router.go
+9
-6
No files found.
router.go
View file @
235d2740
...
...
@@ -574,9 +574,11 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
n
:=
len
(
requestPath
)
if
requestPath
==
route
.
pattern
{
runrouter
=
route
.
controllerType
findrouter
=
true
runMethod
=
p
.
getRunMethod
(
r
.
Method
,
context
,
route
)
break
if
runMethod
!=
""
{
findrouter
=
true
break
}
}
// pattern /admin url /admin 200 /admin/ 404
// pattern /admin/ url /admin 301 /admin/ 200
...
...
@@ -616,10 +618,12 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
r
.
URL
.
RawQuery
=
url
.
Values
(
values
)
.
Encode
()
}
runrouter
=
route
.
controllerType
findrouter
=
true
context
.
Input
.
Params
=
params
runMethod
=
p
.
getRunMethod
(
r
.
Method
,
context
,
route
)
break
if
runMethod
!=
""
{
findrouter
=
true
break
}
}
}
...
...
@@ -801,9 +805,8 @@ func (p *ControllerRegistor) getRunMethod(method string, context *beecontext.Con
return
m
}
else
if
m
,
ok
=
router
.
methods
[
"*"
];
ok
{
return
m
}
else
{
return
strings
.
Title
(
method
)
}
return
""
}
else
{
return
strings
.
Title
(
method
)
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment