From: Willy Tarreau <w@1wt.eu>
Date: Fri, 20 Aug 2010 11:35:41 +0000 (+0200)
Subject: [BUG] conf: add tcp-request content rules to the correct list
X-Git-Tag: v1.5-dev8~487
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb024dc1c996c91fe2c006465b156754a4f4b71e;p=thirdparty%2Fhaproxy.git

[BUG] conf: add tcp-request content rules to the correct list

Due to the change in commit 68c03, the tcp-request content rules were
unfortunately being added to the request rules.
---

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 301666f3c6..2670666126 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -919,6 +919,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
 	}
 
 	rule = (struct tcp_rule *)calloc(1, sizeof(*rule));
+	LIST_INIT(&rule->list);
 	arg = 1;
 
 	if (strcmp(args[1], "content") == 0) {
@@ -938,6 +939,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
 					  name);
 			warn++;
 		}
+		LIST_ADDQ(&curpx->tcp_req.inspect_rules, &rule->list);
 	}
 	else if (strcmp(args[1], "connection") == 0) {
 		arg++;
@@ -971,6 +973,7 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
 						  name);
 			warn++;
 		}
+		LIST_ADDQ(&curpx->tcp_req.l4_rules, &rule->list);
 	}
 	else {
 		retlen = snprintf(err, errlen,
@@ -979,8 +982,6 @@ static int tcp_parse_tcp_req(char **args, int section_type, struct proxy *curpx,
 		goto error;
 	}
 
-	LIST_INIT(&rule->list);
-	LIST_ADDQ(&curpx->tcp_req.l4_rules, &rule->list);
 	return warn;
  error:
 	free(rule);