diff --git a/include/haproxy/log-t.h b/include/haproxy/log-t.h index 7447c862d3..a2cd187548 100644 --- a/include/haproxy/log-t.h +++ b/include/haproxy/log-t.h @@ -44,7 +44,7 @@ #define LOG_OPT_QUOTE 0x00000004 #define LOG_OPT_REQ_CAP 0x00000008 #define LOG_OPT_RES_CAP 0x00000010 -#define LOG_OPT_HTTP 0x00000020 +#define LOG_OPT_HTTP 0x00000020 // forces http-encoding on the payload, incompatible with LOG_OPT_ENCODE #define LOG_OPT_ESC 0x00000040 #define LOG_OPT_MERGE_SPACES 0x00000080 #define LOG_OPT_BIN 0x00000100 diff --git a/src/http_act.c b/src/http_act.c index f0a19f362e..b7cc5f209e 100644 --- a/src/http_act.c +++ b/src/http_act.c @@ -1952,7 +1952,7 @@ static enum act_parse_ret parse_http_set_map(const char **args, int *orig_arg, s /* key pattern */ lf_expr_init(&rule->arg.map.key); - if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.key, LOG_OPT_HTTP, cap, err)) { + if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.key, LOG_OPT_NONE, cap, err)) { free(rule->arg.map.ref); return ACT_RET_PRS_ERR; } @@ -1961,7 +1961,7 @@ static enum act_parse_ret parse_http_set_map(const char **args, int *orig_arg, s /* value pattern for set-map only */ cur_arg++; lf_expr_init(&rule->arg.map.value); - if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.value, LOG_OPT_HTTP, cap, err)) { + if (!parse_logformat_string(args[cur_arg], px, &rule->arg.map.value, LOG_OPT_NONE, cap, err)) { free(rule->arg.map.ref); return ACT_RET_PRS_ERR; } diff --git a/src/http_htx.c b/src/http_htx.c index 36356edf02..1e0e940667 100644 --- a/src/http_htx.c +++ b/src/http_htx.c @@ -1799,7 +1799,7 @@ struct http_reply *http_parse_http_reply(const char **args, int *orig_arg, struc memprintf(errmsg, "a content type must be defined with a log-format payload"); goto error; } - if (!parse_logformat_string(obj, px, &reply->body.fmt, LOG_OPT_HTTP, cap, errmsg)) + if (!parse_logformat_string(obj, px, &reply->body.fmt, LOG_OPT_NONE, cap, errmsg)) goto error; }