From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 3 Feb 2025 07:20:40 +0000 (+0100)
Subject: BUG/MINOR: tevt/http-ana: Remove badly placed event reports
X-Git-Tag: v3.2-dev5~40
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=274c9d21a6e21e96895b156dfc9f2d48a74634cf;p=thirdparty%2Fhaproxy.git

BUG/MINOR: tevt/http-ana: Remove badly placed event reports

When specific events for the stream location were added, some reports about
message interception were not removed. These reports are now removed.

No need to backport.
---

diff --git a/src/http_ana.c b/src/http_ana.c
index f1ba56cc3..75a8523fb 100644
--- a/src/http_ana.c
+++ b/src/http_ana.c
@@ -800,7 +800,6 @@ int http_process_tarpit(struct stream *s, struct channel *req, int an_bit)
 	 */
 	s->logs.t_queue = ns_to_ms(now_ns - s->logs.accept_ts);
 
-	// XXX: All errors are handled as intercepted here !
 	stream_report_term_evt(s->scf, strm_tevt_type_intercepted);
 	http_set_term_flags(s);
 	http_reply_and_close(s, txn->status, (!(s->scf->flags & SC_FL_ERROR) ? http_error_message(s) : NULL));
@@ -2269,8 +2268,6 @@ int http_response_forward_body(struct stream *s, struct channel *res, int an_bit
 	goto return_error;
 
   return_int_err:
-	// XXX: All errors are handled as intercepted here !
-	stream_report_term_evt(s->scb, strm_tevt_type_intercepted);
 	_HA_ATOMIC_INC(&sess->fe->fe_counters.internal_errors);
 	_HA_ATOMIC_INC(&s->be->be_counters.internal_errors);
 	if (sess->listener && sess->listener->counters)
@@ -2284,8 +2281,6 @@ int http_response_forward_body(struct stream *s, struct channel *res, int an_bit
 	goto return_error;
 
   return_bad_res:
-	// XXX: All errors are handled as intercepted here !
-	stream_report_term_evt(s->scb, strm_tevt_type_intercepted);
 	_HA_ATOMIC_INC(&s->be->be_counters.failed_resp);
 	if (objt_server(s->target)) {
 		_HA_ATOMIC_INC(&__objt_server(s->target)->counters.failed_resp);