summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-04-30 10:47:45 +0200
committerHeiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>2021-04-30 14:08:21 +0200
commit919111edac911ba9c15422eafd7c5bf14d416d26 (patch)
tree8b600450a31d036cbd9894e79fbf32311498ccc0
parente9cecc465a570c1a4f34b199eae6bdd0a52ee2b0 (diff)
downloadexim4-919111edac911ba9c15422eafd7c5bf14d416d26.tar.gz
Fix BDAT issue for body w/o trailing CRLF (again Bug 1974)exim-4.94.2
-rw-r--r--src/src/smtp_in.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/src/smtp_in.c b/src/src/smtp_in.c
index e57059a51..17d17beb9 100644
--- a/src/src/smtp_in.c
+++ b/src/src/smtp_in.c
@@ -843,6 +843,7 @@ int
bdat_ungetc(int ch)
{
chunking_data_left++;
+bdat_push_receive_functions(); /* we're not done yet, calling push is safe, because it checks the state before pushing anything */
return lwr_receive_ungetc(ch);
}
@@ -2477,7 +2478,7 @@ TCP_SYN_RCV (as of 12.1) so no idea about data-use. */
if (getsockopt(fileno(smtp_out), IPPROTO_TCP, TCP_FASTOPEN, &is_fastopen, &len) == 0)
{
- if (is_fastopen)
+ if (is_fastopen)
{
DEBUG(D_receive)
debug_printf("TFO mode connection (TCP_FASTOPEN getsockopt)\n");
@@ -5859,7 +5860,7 @@ while (done <= 0)
/* If not serializing, do the exec right away. Otherwise, fork down
into another process. */
- if ( !smtp_etrn_serialize
+ if ( !smtp_etrn_serialize
|| (pid = exim_fork(US"etrn-serialised-command")) == 0)
{
DEBUG(D_exec) debug_print_argv(argv);