From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 19 Jul 2021 08:32:16 +0000 (+0200)
Subject: CLEANUP: http_ana: Remove now unused label from http_process_request()
X-Git-Tag: v2.5-dev3~45
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b73f653d00edb0128be73fbd9b8e7bc93373704d;p=thirdparty%2Fhaproxy.git

CLEANUP: http_ana: Remove now unused label from http_process_request()

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.
---

diff --git a/src/http_ana.c b/src/http_ana.c
index 884ad50421..b360540885 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -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))