diff --git a/src/dns.c b/src/dns.c index 64bb0d15f..5ecb46905 100644 --- a/src/dns.c +++ b/src/dns.c @@ -2247,7 +2247,7 @@ enum act_return dns_action_do_resolve(struct act_rule *rule, struct proxy *px, fqdn = smp->data.u.str.area; if (action_prepare_for_resolution(s, fqdn) == -1) - return ACT_RET_ERR; + return ACT_RET_CONT; /* on error, ignore the action */ s->dns_ctx.parent = rule; dns_link_resolution(s, OBJ_TYPE_STREAM, 0); diff --git a/src/flt_spoe.c b/src/flt_spoe.c index f23cafed7..d458f19d6 100644 --- a/src/flt_spoe.c +++ b/src/flt_spoe.c @@ -4493,9 +4493,8 @@ parse_spoe_flt(char **args, int *cur_arg, struct proxy *px, /* Send message of a SPOE group. This is the action_ptr callback of a rule * associated to a "send-spoe-group" action. * - * It returns ACT_RET_CONT is processing is finished without error, it returns - * ACT_RET_YIELD if the action is in progress. Otherwise it returns - * ACT_RET_ERR. */ + * It returns ACT_RET_CONT if processing is finished (with error or not), it returns + * ACT_RET_YIELD if the action is in progress. */ static enum act_return spoe_send_group(struct act_rule *rule, struct proxy *px, struct session *sess, struct stream *s, int flags) @@ -4515,7 +4514,7 @@ spoe_send_group(struct act_rule *rule, struct proxy *px, } } if (agent == NULL || group == NULL || ctx == NULL) - return ACT_RET_ERR; + return ACT_RET_CONT; if (ctx->state == SPOE_CTX_ST_NONE) return ACT_RET_CONT; @@ -4552,7 +4551,7 @@ spoe_send_group(struct act_rule *rule, struct proxy *px, return ACT_RET_YIELD; } else - return ACT_RET_ERR; + return ACT_RET_CONT; } /* Check an "send-spoe-group" action. Here, we'll try to find the real SPOE diff --git a/src/hlua.c b/src/hlua.c index 742acc706..8f46566c2 100644 --- a/src/hlua.c +++ b/src/hlua.c @@ -6225,7 +6225,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px, case HLUA_E_OK: if (!consistency_check(s, dir, &s->hlua->cons)) { si_retnclose(&s->si[0], &msg); - return ACT_RET_ERR; + return ACT_RET_DONE; } if (s->hlua->flags & HLUA_STOP) return ACT_RET_DONE; @@ -6257,7 +6257,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px, case HLUA_E_ERRMSG: if (!consistency_check(s, dir, &s->hlua->cons)) { si_retnclose(&s->si[0], &msg); - return ACT_RET_ERR; + return ACT_RET_DONE; } /* Display log. */ SEND_ERR(px, "Lua function '%s': %s.\n", @@ -6268,7 +6268,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px, case HLUA_E_ETMOUT: if (!consistency_check(s, dir, &s->hlua->cons)) { si_retnclose(&s->si[0], &msg); - return ACT_RET_ERR; + return ACT_RET_DONE; } SEND_ERR(px, "Lua function '%s': execution timeout.\n", rule->arg.hlua_rule->fcn.name); return 0; @@ -6276,7 +6276,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px, case HLUA_E_NOMEM: if (!consistency_check(s, dir, &s->hlua->cons)) { si_retnclose(&s->si[0], &msg); - return ACT_RET_ERR; + return ACT_RET_DONE; } SEND_ERR(px, "Lua function '%s': out of memory error.\n", rule->arg.hlua_rule->fcn.name); return 0; @@ -6284,7 +6284,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px, case HLUA_E_YIELD: if (!consistency_check(s, dir, &s->hlua->cons)) { si_retnclose(&s->si[0], &msg); - return ACT_RET_ERR; + return ACT_RET_DONE; } SEND_ERR(px, "Lua function '%s': aborting Lua processing on expired timeout.\n", rule->arg.hlua_rule->fcn.name); @@ -6293,7 +6293,7 @@ static enum act_return hlua_action(struct act_rule *rule, struct proxy *px, case HLUA_E_ERR: if (!consistency_check(s, dir, &s->hlua->cons)) { si_retnclose(&s->si[0], &msg); - return ACT_RET_ERR; + return ACT_RET_DONE; } /* Display log. */ SEND_ERR(px, "Lua function '%s' return an unknown error.\n", diff --git a/src/http_act.c b/src/http_act.c index e86b6160d..823907c1e 100644 --- a/src/http_act.c +++ b/src/http_act.c @@ -51,7 +51,7 @@ static enum act_return http_action_set_req_line(struct act_rule *rule, struct pr struct session *sess, struct stream *s, int flags) { struct buffer *replace; - enum act_return ret = ACT_RET_ERR; + enum act_return ret = ACT_RET_CONT; replace = alloc_trash_chunk(); if (!replace) @@ -67,8 +67,6 @@ static enum act_return http_action_set_req_line(struct act_rule *rule, struct pr http_req_replace_stline(rule->arg.http.action, replace->area, replace->data, px, s); - ret = ACT_RET_CONT; - leave: free_trash_chunk(replace); return ret; @@ -143,7 +141,7 @@ static enum act_parse_ret parse_set_req_line(const char **args, int *orig_arg, s static enum act_return http_action_replace_uri(struct act_rule *rule, struct proxy *px, struct session *sess, struct stream *s, int flags) { - enum act_return ret = ACT_RET_ERR; + enum act_return ret = ACT_RET_CONT; struct buffer *replace, *output; struct ist uri; int len; @@ -171,8 +169,6 @@ static enum act_return http_action_replace_uri(struct act_rule *rule, struct pro http_req_replace_stline((long)rule->arg.act.p[0], output->area, len, px, s); - ret = ACT_RET_CONT; - leave: free_trash_chunk(output); free_trash_chunk(replace);