X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e0574cb59a15a54466beb2f30eb016ced390bf39..3fc73bdc7aa8ac2b2b290033f602bdb947ae8049:/src/src/smtp_in.c

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index daaab9172..840594544 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -391,7 +391,9 @@ if (  !smtp_enforce_sync || !sender_host_address
    || sender_host_notsocket || !smtp_in_pipelining_advertised)
   return FALSE;
 
-return !wouldblock_reading();
+if (wouldblock_reading()) return FALSE;
+smtp_in_pipelining_used = TRUE;
+return TRUE;
 }
 
 
@@ -2428,7 +2430,7 @@ count_nonmail = TRUE_UNSET;
 synprot_error_count = unknown_command_count = nonmail_command_count = 0;
 smtp_delay_mail = smtp_rlm_base;
 auth_advertised = FALSE;
-smtp_in_pipelining_advertised = FALSE;
+smtp_in_pipelining_advertised = smtp_in_pipelining_used = FALSE;
 pipelining_enable = TRUE;
 sync_cmd_limit = NON_SYNC_CMD_NON_PIPELINING;
 smtp_exit_function_called = FALSE;    /* For avoiding loop in not-quit exit */
@@ -4717,9 +4719,6 @@ while (done <= 0)
 #if defined(SUPPORT_TLS) && defined(EXPERIMENTAL_REQUIRETLS)
 	  case ENV_MAIL_OPT_REQTLS:
 	    {
-	    const uschar * list = value;
-	    int sep = ',';
-	    const uschar * opt;
 	    uschar * r, * t;
 
 	    if (!requiretls_advertised)