From: Willy Tarreau <w@1wt.eu>
Date: Tue, 10 Mar 2015 14:25:54 +0000 (+0100)
Subject: BUG/MAJOR: http: fix stats regression consecutive to HTTP_RULE_RES_YIELD
X-Git-Tag: v1.6-dev1~44
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=612adb8459402cb9404b03e6ca0e227dc74a4ceb;p=thirdparty%2Fhaproxy.git

BUG/MAJOR: http: fix stats regression consecutive to HTTP_RULE_RES_YIELD

Commit bc4c1ac ("MEDIUM: http/tcp: permit to resume http and tcp custom actions")
unfortunately broke the stats applet by moving the clearing of the analyser bit
after processing the applet headers. It used to work only in HTTP/1.1 and not
in HTTP/1.0. This is 1.6-specific, no backport is needed.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index f8ad754b10..f0f4cba49c 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -6337,8 +6337,11 @@ int http_process_res_common(struct session *s, struct channel *rep, int an_bit,
 	/* The stats applet needs to adjust the Connection header but we don't
 	 * apply any filter there.
 	 */
-	if (unlikely(objt_applet(s->target) == &http_stats_applet))
+	if (unlikely(objt_applet(s->target) == &http_stats_applet)) {
+		rep->analysers &= ~an_bit;
+		rep->analyse_exp = TICK_ETERNITY;
 		goto skip_filters;
+	}
 
 	/*
 	 * We will have to evaluate the filters.