github-mirror/caddy
github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-04-09 08:20:15 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

gzip strips Accept-Encoding header after using it

Browse Source
This commit is contained in:
Matthew Holt 2015-04-26 22:53:47 -06:00
parent 7d46108c12
commit dba4dcb4a5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/fastcgi/fastcgi.go
View File

@ -196,12 +196,8 @@ func (h Handler) buildEnv(r *http.Request, rule Rule) (map[string]string, error)
for field, val := range r.Header { for field, val := range r.Header {
header := strings.ToUpper(field) header := strings.ToUpper(field)
header = headerNameReplacer.Replace(header) header = headerNameReplacer.Replace(header)
// We don't want to pass the encoding header to prevent the fastcgi server from gzipping
// TODO: is there a better way.
if header != "ACCEPT_ENCODING" {
env["HTTP_"+header] = strings.Join(val, ", ") env["HTTP_"+header] = strings.Join(val, ", ")
} }
}
return env, nil return env, nil
} }

3
middleware/gzip/gzip.go
View File

@ -33,6 +33,9 @@ func (g Gzip) ServeHTTP(w http.ResponseWriter, r *http.Request) (int, error) {
return g.Next.ServeHTTP(w, r) return g.Next.ServeHTTP(w, r)
} }
// Delete this header so gzipping isn't repeated later in the chain
r.Header.Del("Accept-Encoding")
w.Header().Set("Content-Encoding", "gzip") w.Header().Set("Content-Encoding", "gzip")
gzipWriter := gzip.NewWriter(w) gzipWriter := gzip.NewWriter(w)
defer gzipWriter.Close() defer gzipWriter.Close()