From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 4 Jan 2021 17:59:23 +0000 (+0000)
Subject: BSD: avoid delay on continued-connection
X-Git-Tag: exim-4.95-RC0~165
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/80acfd092b5f785bd971dcf911b4fe7aec9faaa2

BSD: avoid delay on continued-connection

Broken-by: 6454662ecb
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 8f42871bf..2a600d480 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -4393,10 +4393,13 @@ This change is being made on 31-Jul-98. After over a year of trouble-free
 operation, the old commented-out code was removed on 17-Sep-99. */
 
 SEND_QUIT:
+if (sx->send_quit)
+  {
 #ifdef EXIM_TCP_CORK
-(void) setsockopt(sx->cctx.sock, IPPROTO_TCP, EXIM_TCP_CORK, US &on, sizeof(on));
+  (void) setsockopt(sx->cctx.sock, IPPROTO_TCP, EXIM_TCP_CORK, US &on, sizeof(on));
 #endif
-if (sx->send_quit) (void)smtp_write_command(sx, SCMD_FLUSH, "QUIT\r\n");
+  (void)smtp_write_command(sx, SCMD_FLUSH, "QUIT\r\n");
+  }
 
 END_OFF: