summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2020-03-15 21:08:28 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2020-03-15 21:08:28 +0000
commit130212d30d47e588c2bc03edcfce11bf3857da03 (patch)
tree2b16a18fc037f6367924daaf6440531d245a7461
parent14bd960fabc9e22ceab77ba69a9d14a4cc2e7b50 (diff)
downloadexim4-130212d30d47e588c2bc03edcfce11bf3857da03.tar.gz
Fix spurious detection of timeout while writing to transport filter
-rw-r--r--doc/doc-txt/ChangeLog2
-rw-r--r--src/src/transport.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 001f919d7..4875289b3 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -147,6 +147,8 @@ JH/30 When an pipelined-connect fails at the first response, assume incorrect
cached capability (perhaps the peer reneged?) and immediately retry in
non-pipelined mode.
+JH/31 Fix spurious detection of timeout while writing to transport filter.
+
Exim version 4.93
-----------------
diff --git a/src/src/transport.c b/src/src/transport.c
index 3eb1c8097..e4aaa7deb 100644
--- a/src/src/transport.c
+++ b/src/src/transport.c
@@ -265,6 +265,7 @@ for (int i = 0; i < 100; i++)
}
else /* Timeout wanted. */
{
+ sigalrm_seen = FALSE;
ALARM(local_timeout);
rc = tpt_write(fd, block, len, more, tctx->options);
save_errno = errno;