]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: proto_tcp: custom action continue is ignored
authorThierry FOURNIER <tfournier@arpalert.org>
Tue, 11 Aug 2015 07:48:02 +0000 (09:48 +0200)
committerWilly Tarreau <w@1wt.eu>
Tue, 11 Aug 2015 11:45:46 +0000 (13:45 +0200)
The custom action is ignored by 'tcp-request connection'. This patch
fix this behavior and take in account the value of the flag 'action'.

src/proto_tcp.c

index e6da5d18e42ccd7840af5c769e7717436c0f1657..e4998682e83b9be2899d2effa26ae2b6f653ebf6 100644 (file)
@@ -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;