From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Wed, 11 Jun 2025 10:36:21 +0000 (+0100)
Subject: [Fix] Fix proxy headers duplication
X-Git-Tag: 3.12.1~8^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68eee79ed2e78f9170867cafe4dd119dc24a116d;p=thirdparty%2Frspamd.git

[Fix] Fix proxy headers duplication

Issue: #5505
---

diff --git a/src/rspamd_proxy.c b/src/rspamd_proxy.c
index 3e63fc13ff..77d2336b28 100644
--- a/src/rspamd_proxy.c
+++ b/src/rspamd_proxy.c
@@ -1686,6 +1686,7 @@ proxy_open_mirror_connections(struct rspamd_proxy_session *session)
 							rspamd_http_message_remove_header(msg, "Host");
 							rspamd_http_message_add_header(msg, "Host", up_name);
 						}
+						rspamd_http_message_remove_header(msg, "Connection");
 						rspamd_http_message_add_header(msg, "Connection", "keep-alive");
 
 						if (msg->url->len == 0) {
@@ -1824,6 +1825,7 @@ proxy_open_mirror_connections(struct rspamd_proxy_session *session)
 			rspamd_http_message_remove_header(msg, "Host");
 			rspamd_http_message_add_header(msg, "Host", up_name);
 		}
+		rspamd_http_message_remove_header(msg, "Connection");
 		rspamd_http_message_add_header(msg, "Connection",
 									   m->keepalive ? "keep-alive" : "close");
 
@@ -2673,9 +2675,6 @@ proxy_client_finish_handler(struct rspamd_http_connection *conn,
 		rspamd_http_message_remove_header(msg, "Connection");
 		rspamd_http_message_remove_header(msg, "Key");
 
-		/* Add log tag header based on worker's default configuration */
-		rspamd_proxy_add_log_tag_header(msg, session, session->ctx->log_tag_type);
-
 		proxy_open_mirror_connections(session);
 		rspamd_http_connection_reset(session->client_conn);