From: Willy Tarreau Date: Tue, 17 Jun 2014 16:58:26 +0000 (+0200) Subject: BUG/MINOR: http: fix typos in previous patch X-Git-Tag: v1.5.0~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8543928240a48339a70950a3fd51b98bccf93a8;p=thirdparty%2Fhaproxy.git BUG/MINOR: http: fix typos in previous patch When I renamed the modify-header action to replace-value, one of them was mistakenly set to "replace-val" instead. Additionally, differentiation of the two actions must be done on args[0][8] and not *args[8]. Thanks Thierry for spotting... --- diff --git a/src/proto_http.c b/src/proto_http.c index 568b91b007..572739db4c 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -9066,8 +9066,8 @@ struct http_req_rule *parse_http_req_cond(const char **args, const char *file, i proxy->conf.lfs_file = strdup(proxy->conf.args.file); proxy->conf.lfs_line = proxy->conf.args.line; cur_arg += 2; - } else if (strcmp(args[0], "replace-header") == 0 || strcmp(args[0], "replace-val") == 0) { - rule->action = *args[8] == 'h' ? HTTP_REQ_ACT_REPLACE_HDR : HTTP_REQ_ACT_REPLACE_VAL; + } else if (strcmp(args[0], "replace-header") == 0 || strcmp(args[0], "replace-value") == 0) { + rule->action = args[0][8] == 'h' ? HTTP_REQ_ACT_REPLACE_HDR : HTTP_REQ_ACT_REPLACE_VAL; cur_arg = 1; if (!*args[cur_arg] || !*args[cur_arg+1] || !*args[cur_arg+2] || @@ -9421,7 +9421,7 @@ struct http_res_rule *parse_http_res_cond(const char **args, const char *file, i proxy->conf.lfs_line = proxy->conf.args.line; cur_arg += 2; } else if (strcmp(args[0], "replace-header") == 0 || strcmp(args[0], "replace-value") == 0) { - rule->action = *args[8] == 'h' ? HTTP_RES_ACT_REPLACE_HDR : HTTP_RES_ACT_REPLACE_VAL; + rule->action = args[0][8] == 'h' ? HTTP_RES_ACT_REPLACE_HDR : HTTP_RES_ACT_REPLACE_VAL; cur_arg = 1; if (!*args[cur_arg] || !*args[cur_arg+1] || !*args[cur_arg+2] ||