Cutlery/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-11-04 03:27:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #172 from abiosoft/fastcgi-fix

Browse Source 
fastcgi: Fix for Issue 141: index not found, 502 Bad Gateway.
This commit is contained in:
Matt Holt 2015-06-30 10:23:49 -06:00
commit 75b77d508d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
middleware/fastcgi/fastcgi.go
View File

@ -176,7 +176,6 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
"CONTENT_TYPE": r.Header.Get("Content-Type"), "CONTENT_TYPE": r.Header.Get("Content-Type"),
"GATEWAY_INTERFACE": "CGI/1.1", "GATEWAY_INTERFACE": "CGI/1.1",
"PATH_INFO": pathInfo, "PATH_INFO": pathInfo,
"PATH_TRANSLATED": filepath.Join(h.AbsRoot, pathInfo), // Info: http://www.oreilly.com/openbook/cgi/ch02_04.html
"QUERY_STRING": r.URL.RawQuery, "QUERY_STRING": r.URL.RawQuery,
"REMOTE_ADDR": ip, "REMOTE_ADDR": ip,
"REMOTE_HOST": ip, // For speed, remote host lookups disabled "REMOTE_HOST": ip, // For speed, remote host lookups disabled
@ -198,6 +197,13 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
"SCRIPT_NAME": scriptName, "SCRIPT_NAME": scriptName,
} }
// compliance with the CGI specification that PATH_TRANSLATED
// should only exist if PATH_INFO is defined.
// Info: https://www.ietf.org/rfc/rfc3875 Page 14
if env["PATH_INFO"] != "" {
env["PATH_TRANSLATED"] = filepath.Join(h.AbsRoot, pathInfo) // Info: http://www.oreilly.com/openbook/cgi/ch02_04.html
}
// Add env variables from config // Add env variables from config
for _, envVar := range rule.EnvVars { for _, envVar := range rule.EnvVars {
env[envVar[0]] = envVar[1] env[envVar[0]] = envVar[1]