mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-13 10:37:02 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: proto_http: replace generic opaque types by real used types for the actions on thr request line

Browse Source 
This patch removes the generic opaque type for storing the configuration of the
action "set-method", "set-path", "set-query" and "set-uri".
This commit is contained in:
Thierry FOURNIER 2015-07-31 08:54:25 +02:00 committed by Willy Tarreau
parent a002dc9df8
commit 8855a92d8c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/types/action.h
View File

@ -57,6 +57,10 @@ struct act_rule {
struct list value; /* pattern to retrieve MAP value */ struct list value; /* pattern to retrieve MAP value */
} map; } map;
struct sample_expr *expr; struct sample_expr *expr;
struct {
struct list logfmt;
int action;
} http;
struct hlua_rule *hlua_rule; struct hlua_rule *hlua_rule;
struct { struct {
struct sample_expr *expr; struct sample_expr *expr;

18
src/proto_http.c
View File

@ -12248,11 +12248,11 @@ int http_action_set_req_line(struct act_rule *rule, struct proxy *px,
chunk_reset(&trash); chunk_reset(&trash);
/* If we have to create a query string, prepare a '?'. */ /* If we have to create a query string, prepare a '?'. */
if (*(int *)&rule->arg.act.p[2] == 2) if (rule->arg.http.action == 2)
trash.str[trash.len++] = '?'; trash.str[trash.len++] = '?';
trash.len += build_logline(s, trash.str + trash.len, trash.size - trash.len, (struct list *)&rule->arg.act.p[0]); trash.len += build_logline(s, trash.str + trash.len, trash.size - trash.len, &rule->arg.http.logfmt);
http_replace_req_line(*(int *)&rule->arg.act.p[2], trash.str, trash.len, px, s); http_replace_req_line(rule->arg.http.action, trash.str, trash.len, px, s);
return 1; return 1;
} }
@ -12275,19 +12275,19 @@ int parse_set_req_line(const char **args, int *orig_arg, struct proxy *px, struc
switch (args[0][4]) { switch (args[0][4]) {
case 'm' : case 'm' :
*(int *)&rule->arg.act.p[2] = 0; rule->arg.http.action = 0;
rule->action_ptr = http_action_set_req_line; rule->action_ptr = http_action_set_req_line;
break; break;
case 'p' : case 'p' :
*(int *)&rule->arg.act.p[2] = 1; rule->arg.http.action = 1;
rule->action_ptr = http_action_set_req_line; rule->action_ptr = http_action_set_req_line;
break; break;
case 'q' : case 'q' :
*(int *)&rule->arg.act.p[2] = 2; rule->arg.http.action = 2;
rule->action_ptr = http_action_set_req_line; rule->action_ptr = http_action_set_req_line;
break; break;
case 'u' : case 'u' :
*(int *)&rule->arg.act.p[2] = 3; rule->arg.http.action = 3;
rule->action_ptr = http_action_set_req_line; rule->action_ptr = http_action_set_req_line;
break; break;
default: default:
@ -12301,9 +12301,9 @@ int parse_set_req_line(const char **args, int *orig_arg, struct proxy *px, struc
return -1; return -1;
} }
LIST_INIT((struct list *)&rule->arg.act.p[0]); LIST_INIT(&rule->arg.http.logfmt);
proxy->conf.args.ctx = ARGC_HRQ; proxy->conf.args.ctx = ARGC_HRQ;
parse_logformat_string(args[cur_arg], proxy, (struct list *)&rule->arg.act.p[0], LOG_OPT_HTTP, parse_logformat_string(args[cur_arg], proxy, &rule->arg.http.logfmt, LOG_OPT_HTTP,
(proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR, (proxy->cap & PR_CAP_FE) ? SMP_VAL_FE_HRQ_HDR : SMP_VAL_BE_HRQ_HDR,
proxy->conf.args.file, proxy->conf.args.line); proxy->conf.args.file, proxy->conf.args.line);