]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
CLEANUP: http_ana: Remove now unused label from http_process_request()
authorChristopher Faulet <cfaulet@haproxy.com>
Mon, 19 Jul 2021 08:32:16 +0000 (10:32 +0200)
committerChristopher Faulet <cfaulet@haproxy.com>
Mon, 19 Jul 2021 08:32:17 +0000 (10:32 +0200)
Since last change on HTTP analysers (252412316 "MEDIUM: proxy: remove
long-broken 'option http_proxy'"), http_process_request() may only return
internal errors on failures. Thus the label used to handle bad requests may
be removed.

This patch should fix the issue #1330.

src/http_ana.c

index 884ad50421bb27af03a1c690fe5dc34bbf2f17ba..b3605408850fec8e1edbfe300018609ab40bebd1 100644 (file)
@@ -801,16 +801,7 @@ int http_process_request(struct stream *s, struct channel *req, int an_bit)
                _HA_ATOMIC_INC(&s->be->be_counters.internal_errors);
        if (sess->listener && sess->listener->counters)
                _HA_ATOMIC_INC(&sess->listener->counters->internal_errors);
-       goto return_prx_cond;
 
- return_bad_req: /* let's centralize all bad requests */
-       txn->status = 400;
-       _HA_ATOMIC_INC(&sess->fe->fe_counters.failed_req);
-       if (sess->listener && sess->listener->counters)
-               _HA_ATOMIC_INC(&sess->listener->counters->failed_req);
-       /* fall through */
-
- return_prx_cond:
        http_reply_and_close(s, txn->status, http_error_message(s));
 
        if (!(s->flags & SF_ERR_MASK))