RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-14 23:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: proto_http: use an "expr" type in place of generic opaque type.

Browse Source 
This patch removes the generic opaque type for storing the configuration of the
acion "set-src" (HTTP_REQ_ACT_SET_SRC), and use the dedicated type "struct expr"
This commit is contained in:
Thierry FOURNIER 2015-07-31 08:50:51 +02:00 committed by Willy Tarreau
parent f8c1dcea01
commit a002dc9df8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/types/action.h
View File

@ -56,6 +56,7 @@ struct act_rule {
struct list key; /* pattern to retrieve MAP or ACL key */ struct list key; /* pattern to retrieve MAP or ACL key */
struct list value; /* pattern to retrieve MAP value */ struct list value; /* pattern to retrieve MAP value */
} map; } map;
struct sample_expr *expr;
struct hlua_rule *hlua_rule; struct hlua_rule *hlua_rule;
struct { struct {
struct sample_expr *expr; struct sample_expr *expr;

4
src/proto_http.c
View File

@ -3679,7 +3679,7 @@ resume_execution:
if ((cli_conn = objt_conn(sess->origin)) && conn_ctrl_ready(cli_conn)) { if ((cli_conn = objt_conn(sess->origin)) && conn_ctrl_ready(cli_conn)) {
struct sample *smp; struct sample *smp;
smp = sample_fetch_as_type(px, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, rule->arg.act.p[0], SMP_T_ADDR); smp = sample_fetch_as_type(px, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, rule->arg.expr, SMP_T_ADDR);
if (smp) { if (smp) {
if (smp->data.type == SMP_T_IPV4) { if (smp->data.type == SMP_T_IPV4) {
@ -9345,7 +9345,7 @@ struct act_rule *parse_http_req_cond(const char **args, const char *file, int li
goto out_err; goto out_err;
} }
rule->arg.act.p[0] = expr; rule->arg.expr = expr;
rule->action = HTTP_REQ_ACT_SET_SRC; rule->action = HTTP_REQ_ACT_SET_SRC;
} else if (((custom = action_http_req_custom(args[0])) != NULL)) { } else if (((custom = action_http_req_custom(args[0])) != NULL)) {
char *errmsg = NULL; char *errmsg = NULL;