From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 15 Mar 2020 21:08:28 +0000 (+0000)
Subject: Fix spurious detection of timeout while writing to transport filter
X-Git-Tag: exim-4_94_RC0~56
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=130212d30d47e588c2bc03edcfce11bf3857da03;p=exim.git

Fix spurious detection of timeout while writing to transport filter
---

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;