Mirrors/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-02-02 22:27:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #247 from DenBeke/master

Browse source 
fastcgi: Stripping PATH_INFO from SCRIPT_NAME
This commit is contained in:
Matt Holt 2015-09-28 14:33:27 -06:00
commit 79a7f8a460
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
middleware/fastcgi/fastcgi.go Normal file → Executable file
View file

@ -166,6 +166,9 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
scriptFilename = absPath scriptFilename = absPath
} }
// Strip PATH_INFO from SCRIPT_NAME
scriptName = strings.TrimSuffix(scriptName, pathInfo)
// Get the request URI. The request URI might be as it came in over the wire, // 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). // 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, // If it was rewritten, there will be a header indicating the original URL,

4
middleware/fastcgi/fcgiclient.go
View file

@ -381,9 +381,9 @@ func (c *FCGIClient) Request(p map[string]string, req io.Reader) (resp *http.Res
return return
} }
if len(statusParts) > 1 { if len(statusParts) > 1 {
resp.Status = statusParts[1] resp.Status = statusParts[1]
} }
} else { } else {
resp.StatusCode = http.StatusOK resp.StatusCode = http.StatusOK
} }