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
6a320762
Commit
6a320762
authored
Oct 31, 2015
by
Abiola Ibrahim
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #299 from abiosoft/master
Fix for issues #297 and #298
parents
ef617f9c
dd1c49bd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
30 additions
and
17 deletions
+30
-17
middleware/fastcgi/fastcgi.go
middleware/fastcgi/fastcgi.go
+30
-17
No files found.
middleware/fastcgi/fastcgi.go
View file @
6a320762
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
package
fastcgi
package
fastcgi
import
(
import
(
"errors"
"io"
"io"
"net/http"
"net/http"
"os"
"os"
...
@@ -46,10 +47,21 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error)
...
@@ -46,10 +47,21 @@ func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error)
fpath
:=
r
.
URL
.
Path
fpath
:=
r
.
URL
.
Path
if
idx
,
ok
:=
middleware
.
IndexFile
(
h
.
FileSys
,
fpath
,
rule
.
IndexFiles
);
ok
{
if
idx
,
ok
:=
middleware
.
IndexFile
(
h
.
FileSys
,
fpath
,
rule
.
IndexFiles
);
ok
{
fpath
=
idx
fpath
=
idx
// Index file present.
// If request path cannot be split, return error.
if
!
h
.
canSplit
(
fpath
,
rule
)
{
return
http
.
StatusInternalServerError
,
ErrIndexMissingSplit
}
}
else
{
// No index file present.
// If request path cannot be split, ignore request.
if
!
h
.
canSplit
(
fpath
,
rule
)
{
continue
}
}
}
// These criteria work well in this order for PHP sites
// These criteria work well in this order for PHP sites
if
fpath
[
len
(
fpath
)
-
1
]
==
'/'
||
strings
.
HasSuffix
(
fpath
,
rule
.
Ext
)
||
!
h
.
exists
(
fpath
)
{
if
!
h
.
exists
(
fpath
)
||
fpath
[
len
(
fpath
)
-
1
]
==
'/'
||
strings
.
HasSuffix
(
fpath
,
rule
.
Ext
)
{
// Create environment for CGI script
// Create environment for CGI script
env
,
err
:=
h
.
buildEnv
(
r
,
rule
,
fpath
)
env
,
err
:=
h
.
buildEnv
(
r
,
rule
,
fpath
)
...
@@ -137,6 +149,10 @@ func (h Handler) exists(path string) bool {
...
@@ -137,6 +149,10 @@ func (h Handler) exists(path string) bool {
return
false
return
false
}
}
func
(
h
Handler
)
canSplit
(
path
string
,
rule
Rule
)
bool
{
return
strings
.
Contains
(
path
,
rule
.
SplitPath
)
}
// buildEnv returns a set of CGI environment variables for the request.
// buildEnv returns a set of CGI environment variables for the request.
func
(
h
Handler
)
buildEnv
(
r
*
http
.
Request
,
rule
Rule
,
fpath
string
)
(
map
[
string
]
string
,
error
)
{
func
(
h
Handler
)
buildEnv
(
r
*
http
.
Request
,
rule
Rule
,
fpath
string
)
(
map
[
string
]
string
,
error
)
{
var
env
map
[
string
]
string
var
env
map
[
string
]
string
...
@@ -153,22 +169,15 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
...
@@ -153,22 +169,15 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
ip
=
r
.
RemoteAddr
ip
=
r
.
RemoteAddr
}
}
// Split path in preparation for env variables
// Split path in preparation for env variables.
// Previous h.canSplit checks ensure this can never be -1.
splitPos
:=
strings
.
Index
(
fpath
,
rule
.
SplitPath
)
splitPos
:=
strings
.
Index
(
fpath
,
rule
.
SplitPath
)
var
docURI
,
scriptName
,
scriptFilename
,
pathInfo
string
if
splitPos
==
-
1
{
// Request doesn't have the extension, so assume index file in root
docURI
=
"/"
+
rule
.
IndexFiles
[
0
]
scriptName
=
"/"
+
rule
.
IndexFiles
[
0
]
scriptFilename
=
filepath
.
Join
(
h
.
AbsRoot
,
rule
.
IndexFiles
[
0
])
pathInfo
=
fpath
}
else
{
// Request has the extension; path was split successfully
// Request has the extension; path was split successfully
docURI
=
fpath
[
:
splitPos
+
len
(
rule
.
SplitPath
)]
docURI
:=
fpath
[
:
splitPos
+
len
(
rule
.
SplitPath
)]
pathInfo
=
fpath
[
splitPos
+
len
(
rule
.
SplitPath
)
:
]
pathInfo
:=
fpath
[
splitPos
+
len
(
rule
.
SplitPath
)
:
]
scriptName
=
fpath
scriptName
:=
fpath
scriptFilename
=
absPath
scriptFilename
:=
absPath
}
// Strip PATH_INFO from SCRIPT_NAME
// Strip PATH_INFO from SCRIPT_NAME
scriptName
=
strings
.
TrimSuffix
(
scriptName
,
pathInfo
)
scriptName
=
strings
.
TrimSuffix
(
scriptName
,
pathInfo
)
...
@@ -267,4 +276,8 @@ type Rule struct {
...
@@ -267,4 +276,8 @@ type Rule struct {
EnvVars
[][
2
]
string
EnvVars
[][
2
]
string
}
}
var
headerNameReplacer
=
strings
.
NewReplacer
(
" "
,
"_"
,
"-"
,
"_"
)
var
(
headerNameReplacer
=
strings
.
NewReplacer
(
" "
,
"_"
,
"-"
,
"_"
)
ErrIndexMissingSplit
=
errors
.
New
(
"configured index file(s) must include split value"
)
)
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