Merge pull request revel#888 from birkirb/change_compression_handling

brendensoares · brendensoares · commit 9f1075f9e90d · 2015-03-21T22:53:36.000-07:00
Change compression handling
diff --git a/compress.go b/compress.go
@@ -44,16 +44,20 @@ type CompressResponseWriter struct {
 }
 
 func CompressFilter(c *Controller, fc []Filter) {
+	fc[0](c, fc[1:])
 	if Config.BoolDefault("results.compressed", false) {
-		writer := CompressResponseWriter{c.Response.Out, nil, "", false, make(chan bool, 1), nil, false}
-		writer.DetectCompressionType(c.Request, c.Response)
-		w, ok := c.Response.Out.(http.CloseNotifier)
-		if ok {
-			writer.parentNotify = w.CloseNotify()
+		if c.Response.Status != http.StatusNoContent && c.Response.Status != http.StatusNotModified {
+			writer := CompressResponseWriter{c.Response.Out, nil, "", false, make(chan bool, 1), nil, false}
+			writer.DetectCompressionType(c.Request, c.Response)
+			w, ok := c.Response.Out.(http.CloseNotifier)
+			if ok {
+				writer.parentNotify = w.CloseNotify()
+			}
+			c.Response.Out = &writer
+		} else {
+			TRACE.Printf("Compression disabled for response status (%d)", c.Response.Status)
 		}
-		c.Response.Out = &writer
 	}
-	fc[0](c, fc[1:])
 }
 
 func (c CompressResponseWriter) CloseNotify() <-chan bool {
