Adding upstream version 3.0.0.upstream/3.0.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/include/haproxy/action-t.h b/include/haproxy/action-t.h
index f77bdce..eee16a3 100644
--- a/include/haproxy/action-t.h
+++ b/include/haproxy/action-t.h
@@ -25,6 +25,7 @@
 #include <haproxy/applet-t.h>
 #include <haproxy/stick_table-t.h>
 #include <haproxy/vars-t.h>
+#include <haproxy/log-t.h>
 
 struct session;
 struct stream;
@@ -141,15 +142,15 @@ struct act_rule {
 		struct {
 			int i;                 /* integer param (status, nice, loglevel, ..) */
 			struct ist str;        /* string param (reason, header name, ...) */
-			struct list fmt;       /* log-format compatible expression */
+			struct lf_expr fmt;    /* log-format compatible expression */
 			struct my_regex *re;   /* used by replace-header/value/uri/path */
 		} http;                        /* args used by some HTTP rules */
 		struct http_reply *http_reply; /* HTTP response to be used by return/deny/tarpit rules */
 		struct redirect_rule *redir;   /* redirect rule or "http-request redirect" */
 		struct {
 			char *ref;             /* MAP or ACL file name to update */
-			struct list key;       /* pattern to retrieve MAP or ACL key */
-			struct list value;     /* pattern to retrieve MAP value */
+			struct lf_expr key;    /* pattern to retrieve MAP or ACL key */
+			struct lf_expr value;  /* pattern to retrieve MAP value */
 		} map;
 		struct sample_expr *expr;
 		struct {
@@ -167,7 +168,7 @@ struct act_rule {
 		} timeout;
 		struct hlua_rule *hlua_rule;
 		struct {
-			struct list fmt;            /* log-format compatible expression */
+			struct lf_expr fmt;         /* log-format compatible expression */
 			struct sample_expr *expr;
 			uint64_t name_hash;
 			enum vars_scope scope;
@@ -192,6 +193,10 @@ struct act_rule {
 			struct sample_expr *name; /* used to differentiate idle connections */
 		} attach_srv; /* 'attach-srv' rule */
 		struct {
+			int value;
+			struct sample_expr *expr;
+		} expr_int; /* expr or int value (when expr is NULL)*/
+		struct {
 			void *p[4];
 		} act;                         /* generic pointers to be used by custom actions */
 	} arg;                                 /* arguments used by some actions */