From: Willy Tarreau <w@1wt.eu>
Date: Tue, 25 Dec 2012 20:53:25 +0000 (+0100)
Subject: BUG/MINOR: stats: last fix was still wrong
X-Git-Tag: v1.5-dev17~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8b80f0c9a22a31aca29ff55606bb50d7b7b172d8;p=thirdparty%2Fhaproxy.git

BUG/MINOR: stats: last fix was still wrong

Previous commit was still wrong, it broke add-header and set-header
because we don't want to leave on these actions.

The http_check_access_rule() function should be redesigned, it was
initially thought for allow/deny rules but now it is executing other
non-final rules and at the same time returning a pointer to the last
final rule. That becomes a bit confusing and will need to be addressed
before we implement redirect and return.
---

diff --git a/src/proto_http.c b/src/proto_http.c
index deed52ec04..535c159495 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -3113,7 +3113,7 @@ http_check_access_rule(struct proxy *px, struct list *rules, struct session *s,
 				trash.str[trash.len++] = ' ';
 				trash.len += build_logline(s, trash.str + trash.len, trash.size - trash.len, &rule->arg.hdr_add.fmt);
 				http_header_add_tail2(&txn->req, &txn->hdr_idx, trash.str, trash.len);
-				return rule;
+				break;
 			}
 		}
 	}