From e5de01f091f7569aeed877a26ce9909df3709d84 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 13 Jun 2017 19:01:00 +0100 Subject: [PATCH] When pipelining under TLS do not treat fd-readability as tls-readability --- src/src/smtp_in.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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. */ -- 2.30.2