From: Willy Tarreau <w@1wt.eu>
Date: Mon, 19 Nov 2012 13:55:02 +0000 (+0100)
Subject: BUG: compression: properly disable compression when content-type does not match
X-Git-Tag: v1.5-dev13~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b97b6190e127ac034946dca80349c649e423d329;p=thirdparty%2Fhaproxy.git

BUG: compression: properly disable compression when content-type does not match

Disabling compression based on the content-type was improperly done since the
introduction of the COMP_READY flag, sometimes resulting in truncated responses.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index b2ae01cc1a..848e745c0d 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2133,11 +2133,10 @@ int select_compression_response_header(struct session *s, struct buffer *res)
 	return 1;
 
 fail:
-	if (s->flags & SN_COMP_READY) {
+	if (s->flags & SN_COMP_READY)
 		s->comp_algo->end(&s->comp_ctx);
-		s->comp_algo = NULL;
-		s->flags &= ~SN_COMP_READY;
-	}
+	s->comp_algo = NULL;
+	s->flags &= ~SN_COMP_READY;
 	return 0;
 }