From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 9 Dec 2021 11:58:55 +0000 (+0000)
Subject: [Minor] Fix ssl connection reuse
X-Git-Tag: 3.2~171
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4fe64bdcb51eb13b732bfcab0ffb321b16e91395;p=rspamd.git

[Minor] Fix ssl connection reuse
---

diff --git a/src/libserver/http/http_connection.c b/src/libserver/http/http_connection.c
index e82c543c2..afd685ae0 100644
--- a/src/libserver/http/http_connection.c
+++ b/src/libserver/http/http_connection.c
@@ -1264,13 +1264,6 @@ rspamd_http_connection_new_client_keepalive (struct rspamd_http_context *ctx,
 
 		priv = conn->priv;
 
-		if (priv->ssl) {
-			rspamd_ssl_connection_restore_handlers (priv->ssl,
-					rspamd_http_event_handler,
-					rspamd_http_ssl_err_handler,
-					conn);
-		}
-
 		return conn;
 	}
 
@@ -2353,6 +2346,13 @@ rspamd_http_connection_write_message_common (struct rspamd_http_connection *conn
 					return FALSE;
 				}
 			}
+			else {
+				/* Just restore SSL handlers */
+				rspamd_ssl_connection_restore_handlers (priv->ssl,
+						rspamd_http_event_handler,
+						rspamd_http_ssl_err_handler,
+						conn);
+			}
 		}
 	}
 	else {