github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-24 00:19:31 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mholt/caddy

Browse Source
This commit is contained in:
Thomas Hansen 2015-04-27 09:39:40 -06:00
commit dbef6c73bc
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
middleware/gzip/gzip.go
View File

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

2
middleware/websockets/websockets.go
View File

@ -130,5 +130,5 @@ var (
const (
envGatewayInterface = "caddy-CGI/1.1"
envServerSoftware = "caddy/?.?.?" // TODO
envServerSoftware = "caddy/" // TODO: Version
)

2
server/server.go
View File

@ -162,6 +162,8 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
if vh, ok := s.vhosts[host]; ok {
w.Header().Set("Server", "Caddy")
status, _ := vh.stack.ServeHTTP(w, r)
// Fallback error response in case error handling wasn't chained in