RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-17 19:16:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: action: Don't check http capture rules when no id is defined

Browse Source 
This is a regression in the commit 29730ba5 ("MINOR: action: Add a functions to
check http capture rules"). We must check the capture id only when an id is
defined.

This patch must be backported in 1.8.
This commit is contained in:
Christopher Faulet 2017-12-04 09:45:15 +01:00 committed by Willy Tarreau
parent 7912781a30
commit fd608dd2d2
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/proto_http.c
View File

@ -12049,6 +12049,9 @@ enum act_return http_action_req_capture_by_id(struct act_rule *rule, struct prox
*/ */
int check_http_req_capture(struct act_rule *rule, struct proxy *px, char **err) int check_http_req_capture(struct act_rule *rule, struct proxy *px, char **err)
{ {
if (rule->action_ptr != http_action_req_capture_by_id)
return 1;
if (rule->arg.capid.idx >= px->nb_req_cap) { if (rule->arg.capid.idx >= px->nb_req_cap) {
memprintf(err, "unable to find capture id '%d' referenced by http-request capture rule", memprintf(err, "unable to find capture id '%d' referenced by http-request capture rule",
rule->arg.capid.idx); rule->arg.capid.idx);
@ -12235,6 +12238,9 @@ enum act_return http_action_res_capture_by_id(struct act_rule *rule, struct prox
*/ */
int check_http_res_capture(struct act_rule *rule, struct proxy *px, char **err) int check_http_res_capture(struct act_rule *rule, struct proxy *px, char **err)
{ {
if (rule->action_ptr != http_action_res_capture_by_id)
return 1;
if (rule->arg.capid.idx >= px->nb_rsp_cap) { if (rule->arg.capid.idx >= px->nb_rsp_cap) {
memprintf(err, "unable to find capture id '%d' referenced by http-response capture rule", memprintf(err, "unable to find capture id '%d' referenced by http-response capture rule",
rule->arg.capid.idx); rule->arg.capid.idx);