serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-10 04:48:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Prevent Caddy-Rewrite-Original-URI being added as an HTTP ENV variable passed to FastCGI

Browse source 
part of fix for #1153
This commit is contained in:
Toby Allen 2016-10-14 21:09:02 +01:00
parent 3b68482f59
commit 845c2702b1
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
caddyhttp/fastcgi/fastcgi.go
View file

@ -245,6 +245,7 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
env["PATH_TRANSLATED"] = filepath.Join(h.AbsRoot, pathInfo) // Info: http://www.oreilly.com/openbook/cgi/ch02_04.html env["PATH_TRANSLATED"] = filepath.Join(h.AbsRoot, pathInfo) // Info: http://www.oreilly.com/openbook/cgi/ch02_04.html
} }
// Some web apps rely on knowing HTTPS or not // Some web apps rely on knowing HTTPS or not
if r.TLS != nil { if r.TLS != nil {
env["HTTPS"] = "on" env["HTTPS"] = "on"
@ -257,13 +258,19 @@ func (h Handler) buildEnv(r *http.Request, rule Rule, fpath string) (map[string]
env[envVar[0]] = replacer.Replace(envVar[1]) env[envVar[0]] = replacer.Replace(envVar[1])
} }
// Add all HTTP headers to env variables // Add all HTTP headers (except Caddy-Rewrite-Original-URI ) to env variables
for field, val := range r.Header { for field, val := range r.Header {
if strings.ToUpper(field) != strings.ToUpper(internalRewriteFieldName) {
header := strings.ToUpper(field) header := strings.ToUpper(field)
header = headerNameReplacer.Replace(header) header = headerNameReplacer.Replace(header)
env["HTTP_"+header] = strings.Join(val, ", ") env["HTTP_"+header] = strings.Join(val, ", ")
} }
}
return env, nil return env, nil
} }