mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-05 04:56:10 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] http-auth: last fix was wrong

Browse Source 
I'm not sure if the fix is correct:

- if (req_acl->cond)
-         ret = acl_exec_cond(req_acl->cond, px, s, txn, ACL_DIR_REQ);
+ if (!req_acl->cond)
+         continue;

Doesn't it ignore rules with no condition attached? I think that the
proper solution would be the following.
This commit is contained in:
Krzysztof Olędzki 2010-02-01 12:36:53 +01:00 committed by Willy Tarreau
parent 9cc670f7d9
commit 711ad9eb27
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/proto_http.c
View File

@ -2862,13 +2862,13 @@ int http_process_req_common(struct session *s, struct buffer *req, int an_bit, s
continue;
/* check condition, but only if attached */
if (!req_acl->cond)
continue;
if (req_acl->cond) {
ret = acl_exec_cond(req_acl->cond, px, s, txn, ACL_DIR_REQ);
ret = acl_pass(ret);
ret = acl_exec_cond(req_acl->cond, px, s, txn, ACL_DIR_REQ);
ret = acl_pass(ret);
if (req_acl->cond->pol == ACL_COND_UNLESS)
ret = !ret;
if (req_acl->cond->pol == ACL_COND_UNLESS)
ret = !ret;
}
if (ret) {
req_acl_final = req_acl;