From: Willy Tarreau <w@1wt.eu>
Date: Thu, 27 Dec 2012 09:34:21 +0000 (+0100)
Subject: BUG/MINOR: stats: http-request rules still don't cope with stats
X-Git-Tag: v1.5-dev17~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1a1e8072f9b7c04a02e3247e6feb8a09cad0bd67;p=thirdparty%2Fhaproxy.git

BUG/MINOR: stats: http-request rules still don't cope with stats

Since commit 20b0de5, we also had another remaining issue : an
"http-request allow" rule would prevent a stats rule from being
processed.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index 535c159495..3b5a478a20 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3063,8 +3063,8 @@ int http_handle_stats(struct session *s, struct channel *req)
 
 /* Executes the http-request rules <rules> for session <s>, proxy <px> and
  * transaction <txn>. Returns NULL if it executed all rules, or a pointer to
- * the last rule if it had to stop before the end (auth, deny, allow). It may
- * set the TX_CLDENY on txn->flags if it encounters a deny rule.
+ * the last rule if it had to stop before the end (auth, deny). It may set
+ * the TX_CLDENY on txn->flags if it encounters a deny rule.
  */
 static struct http_req_rule *
 http_check_access_rule(struct proxy *px, struct list *rules, struct session *s, struct http_txn *txn)
@@ -3090,7 +3090,7 @@ http_check_access_rule(struct proxy *px, struct list *rules, struct session *s,
 		if (ret) {
 			switch (rule->action) {
 			case HTTP_REQ_ACT_ALLOW:
-				return rule;
+				return NULL;
 			case HTTP_REQ_ACT_DENY:
 				txn->flags |= TX_CLDENY;
 				return rule;