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
be6fc353
Commit
be6fc353
authored
Sep 27, 2015
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fastcgi: Fix REQUEST_URI if rewrite directive changes URL
parent
ca1f1362
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
1 deletion
+19
-1
middleware/fastcgi/fastcgi.go
middleware/fastcgi/fastcgi.go
+12
-1
middleware/rewrite/rewrite.go
middleware/rewrite/rewrite.go
+7
-0
No files found.
middleware/fastcgi/fastcgi.go
View file @
be6fc353
...
...
@@ -166,6 +166,17 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
scriptFilename
=
absPath
}
// Get the request URI. The request URI might be as it came in over the wire,
// or it might have been rewritten internally by the rewrite middleware (see issue #256).
// If it was rewritten, there will be a header indicating the original URL,
// which is needed to get the correct RequestURI value for PHP apps.
const
internalRewriteFieldName
=
"Caddy-Rewrite-Original-URI"
reqURI
:=
r
.
URL
.
RequestURI
()
if
origURI
:=
r
.
Header
.
Get
(
internalRewriteFieldName
);
origURI
!=
""
{
reqURI
=
origURI
r
.
Header
.
Del
(
internalRewriteFieldName
)
}
// Some variables are unused but cleared explicitly to prevent
// the parent environment from interfering.
env
=
map
[
string
]
string
{
...
...
@@ -192,7 +203,7 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
"DOCUMENT_ROOT"
:
h
.
AbsRoot
,
"DOCUMENT_URI"
:
docURI
,
"HTTP_HOST"
:
r
.
Host
,
// added here, since not always part of headers
"REQUEST_URI"
:
r
.
URL
.
RequestURI
()
,
"REQUEST_URI"
:
r
eqURI
,
"SCRIPT_FILENAME"
:
scriptFilename
,
"SCRIPT_NAME"
:
scriptName
,
}
...
...
middleware/rewrite/rewrite.go
View file @
be6fc353
...
...
@@ -49,6 +49,9 @@ func NewSimpleRule(from, to string) SimpleRule {
// Rewrite rewrites the internal location of the current request.
func
(
s
SimpleRule
)
Rewrite
(
r
*
http
.
Request
)
bool
{
if
s
.
From
==
r
.
URL
.
Path
{
// take note of this rewrite for internal use by fastcgi
// all we need is the URI, not full URL
r
.
Header
.
Set
(
"Caddy-Rewrite-Original-URI"
,
r
.
URL
.
RequestURI
())
r
.
URL
.
Path
=
s
.
To
return
true
}
...
...
@@ -129,6 +132,10 @@ func (r *RegexpRule) Rewrite(req *http.Request) bool {
return
false
}
// take note of this rewrite for internal use by fastcgi
// all we need is the URI, not full URL
req
.
Header
.
Set
(
"Caddy-Rewrite-Original-URI"
,
req
.
URL
.
RequestURI
())
// perform rewrite
req
.
URL
.
Path
=
url
.
Path
if
url
.
RawQuery
!=
""
{
...
...
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