Commit 79a7f8a4 authored by Matt Holt's avatar Matt Holt

Merge pull request #247 from DenBeke/master

fastcgi: Stripping PATH_INFO from SCRIPT_NAME
parents be6fc353 bb85a845
...@@ -166,6 +166,9 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string] ...@@ -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,
......
...@@ -381,9 +381,9 @@ func (c *FCGIClient) Request(p map[string]string, req io.Reader) (resp *http.Res ...@@ -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
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment