Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
caddy
Commits
6ca475de
Commit
6ca475de
authored
Apr 12, 2015
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redirect now does exact path matching like rewrite middleware
parent
d8e7adcd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
middleware/redirect/redirect.go
middleware/redirect/redirect.go
+8
-4
No files found.
middleware/redirect/redirect.go
View file @
6ca475de
...
...
@@ -30,9 +30,9 @@ type Redirect struct {
// ServeHTTP implements the middleware.Handler interface.
func
(
rd
Redirect
)
ServeHTTP
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
(
int
,
error
)
{
for
_
,
rule
:=
range
rd
.
Rules
{
if
middleware
.
Path
(
r
.
URL
.
Path
)
.
Matches
(
rule
.
From
)
{
if
r
.
URL
.
Path
==
rule
.
From
{
if
rule
.
From
==
"/"
{
// Catchall redirect preserves path (TODO: This
should be made more consistent
...)
// Catchall redirect preserves path (TODO: This
behavior should be more standardized
...)
http
.
Redirect
(
w
,
r
,
strings
.
TrimSuffix
(
rule
.
To
,
"/"
)
+
r
.
URL
.
Path
,
rule
.
Code
)
return
0
,
nil
}
...
...
@@ -55,7 +55,6 @@ func parse(c middleware.Controller) ([]Rule, error) {
rule
.
From
=
"/"
rule
.
To
=
c
.
Val
()
rule
.
Code
=
307
// TODO: Consider 301 instead?
redirects
=
append
(
redirects
,
rule
)
}
else
if
len
(
args
)
==
3
{
// From, To, and Code specified
rule
.
From
=
args
[
0
]
...
...
@@ -65,10 +64,15 @@ func parse(c middleware.Controller) ([]Rule, error) {
}
else
{
rule
.
Code
=
code
}
redirects
=
append
(
redirects
,
rule
)
}
else
{
return
redirects
,
c
.
ArgErr
()
}
if
rule
.
From
==
rule
.
To
{
return
redirects
,
c
.
Err
(
"Redirect rule cannot allow From and To arguments to be the same."
)
}
redirects
=
append
(
redirects
,
rule
)
}
return
redirects
,
nil
...
...
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