diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-06-13 19:01:00 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-06-13 22:33:57 +0100 |
| commit | e5de01f091f7569aeed877a26ce9909df3709d84 (patch) | |
| tree | 8d17ac03805680cb56bc95690b597536c458e7b4 /src | |
| parent | 268d00ffff678f5c061e34880020d164dca5795e (diff) | |
When pipelining under TLS do not treat fd-readability as tls-readability
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/smtp_in.c | 6 |
1 files 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. */ |