Merge branch 'ponzu-dev' of github.com:ponzu-cms/ponzu into ponzu-dev

1 files changed, 4 insertions, 3 deletions

diff --git a/system/api/gzip.go b/system/api/gzip.go
index be5a51b..02f1535 100644
--- a/system/api/gzip.go
+++ b/system/api/gzip.go
@@ -20,11 +20,13 @@ func Gzip(next http.HandlerFunc) http.HandlerFunc {
 		if strings.Contains(req.Header.Get("Accept-Encoding"), "gzip") {
 			// gzip response data
 			res.Header().Set("Content-Encoding", "gzip")
+			gzWriter := gzip.NewWriter(res)
+			defer gzWriter.Close()
 			var gzres gzipResponseWriter
 			if pusher, ok := res.(http.Pusher); ok {
-				gzres = gzipResponseWriter{res, pusher, gzip.NewWriter(res)}
+				gzres = gzipResponseWriter{res, pusher, gzWriter}
 			} else {
-				gzres = gzipResponseWriter{res, nil, gzip.NewWriter(res)}
+				gzres = gzipResponseWriter{res, nil, gzWriter}
 			}
 
 			next.ServeHTTP(gzres, req)
@@ -43,7 +45,6 @@ type gzipResponseWriter struct {
 }
 
 func (gzw gzipResponseWriter) Write(p []byte) (int, error) {
-	defer gzw.gw.Close()
 	return gzw.gw.Write(p)
 }