From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 13 Jun 2017 18:01:00 +0000 (+0100)
Subject: When pipelining under TLS do not treat fd-readability as tls-readability
X-Git-Tag: exim-4_90_RC1~134
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/e5de01f091f7569aeed877a26ce9909df3709d84

When pipelining under TLS do not treat fd-readability as tls-readability
---

diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index 0ffa21939..92dbac4ce 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -339,8 +339,8 @@ int fd, rc;
 fd_set fds;
 struct timeval tzero;
 
-if (tls_in.active >= 0 && tls_could_read())
-  return FALSE;
+if (tls_in.active >= 0)
+ return !tls_could_read();
 
 if (smtp_inptr < smtp_inend)
   return FALSE;
@@ -3011,7 +3011,7 @@ if (rcpt_in_progress)
   rcpt_in_progress = FALSE;
   }
 
-/* Not output the message, splitting it up into multiple lines if necessary.
+/* Now output the message, splitting it up into multiple lines if necessary.
 We only handle pipelining these responses as far as nonfinal/final groups,
 not the whole MAIL/RCPT/DATA response set. */