]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: http-act: Set stream error flag before returning an error
authorChristopher Faulet <cfaulet@haproxy.com>
Fri, 7 Feb 2020 09:22:31 +0000 (10:22 +0100)
committerChristopher Faulet <cfaulet@haproxy.com>
Fri, 7 Feb 2020 09:37:53 +0000 (10:37 +0100)
In action_http_set_status(), when a rewrite error occurred, the stream error
flag must be set before returning the error.

No need to backport this patch except if commit 333bf8c33 ("MINOR: http-rules:
Set SF_ERR_PRXCOND termination flag when a header rewrite fails") is
backported. This bug was reported in issue #491.

src/http_act.c

index 40af1eab91e9b3d8d592507bcfeb13290009c56a..dc8c33dddaefb57773b35538fc6ab3c51caf198a 100644 (file)
@@ -305,9 +305,9 @@ static enum act_return action_http_set_status(struct act_rule *rule, struct prox
                        _HA_ATOMIC_ADD(&__objt_server(s->target)->counters.failed_rewrites, 1);
 
                if (!(s->txn->req.flags & HTTP_MSGF_SOFT_RW)) {
-                       return ACT_RET_ERR;
                        if (!(s->flags & SF_ERR_MASK))
                                s->flags |= SF_ERR_PRXCOND;
+                       return ACT_RET_ERR;
                }
        }