From: Thierry FOURNIER <tfournier@arpalert.org>
Date: Tue, 11 Aug 2015 07:48:02 +0000 (+0200)
Subject: BUG/MINOR: proto_tcp: custom action continue is ignored
X-Git-Tag: v1.6-dev4~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c89f4f530588a5c23a29d848d4a27a6799359dd4;p=thirdparty%2Fhaproxy.git

BUG/MINOR: proto_tcp: custom action continue is ignored

The custom action is ignored by 'tcp-request connection'. This patch
fix this behavior and take in account the value of the flag 'action'.
---

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index e6da5d18e4..e4998682e8 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -1440,8 +1440,11 @@ int tcp_exec_req_rules(struct session *sess)
 			}
 			else {
 				/* Custom keywords. */
-				if (rule->action_ptr)
+				if (rule->action_ptr) {
 					rule->action_ptr(rule, sess->fe, NULL);
+					if (rule->action == TCP_ACT_CUSTOM_CONT)
+						continue;
+				}
 
 				/* otherwise it's an accept */
 				break;