From: Christopher Faulet <cfaulet@haproxy.com>
Date: Wed, 10 Feb 2021 13:58:01 +0000 (+0100)
Subject: BUG/MINOR: http-ana: Don't increment HTTP error counter on internal errors
X-Git-Tag: v2.4-dev8~90
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf7175f9b6480fa25e859e226a1f460744e163cd;p=thirdparty%2Fhaproxy.git

BUG/MINOR: http-ana: Don't increment HTTP error counter on internal errors

If internal error is reported by the mux during HTTP request parsing, the
HTTP error counter should not be incremented. It should only be incremented
on parsing error to reflect errors caused by clients.

This patch must be backported as far as 2.0. During the backport, the same
must be performed for 408-request-time-out errors.
---

diff --git a/src/http_ana.c b/src/http_ana.c
index c170512f22..4b74626e04 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -110,10 +110,11 @@ int http_wait_for_request(struct stream *s, struct channel *req, int an_bit)
 	/* Parsing errors are caught here */
 	if (htx->flags & (HTX_FL_PARSING_ERROR|HTX_FL_PROCESSING_ERROR)) {
 		stream_inc_http_req_ctr(s);
-		stream_inc_http_err_ctr(s);
 		proxy_inc_fe_req_ctr(sess->listener, sess->fe);
-		if (htx->flags & HTX_FL_PARSING_ERROR)
+		if (htx->flags & HTX_FL_PARSING_ERROR) {
+			stream_inc_http_err_ctr(s);
 			goto return_bad_req;
+		}
 		else
 			goto return_int_err;
 	}