[exim-cvs] Fix spurious detection of timeout while writing t…

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Exim Git Commits Mailing List
Datum:  
To: exim-cvs
Betreff: [exim-cvs] Fix spurious detection of timeout while writing to transport filter
Gitweb: https://git.exim.org/exim.git/commitdiff/130212d30d47e588c2bc03edcfce11bf3857da03
Commit:     130212d30d47e588c2bc03edcfce11bf3857da03
Parent:     14bd960fabc9e22ceab77ba69a9d14a4cc2e7b50
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Mar 15 21:08:28 2020 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Mar 15 21:08:28 2020 +0000


    Fix spurious detection of timeout while writing to transport filter
---
 doc/doc-txt/ChangeLog | 2 ++
 src/src/transport.c   | 1 +
 2 files changed, 3 insertions(+)


diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 001f919..4875289 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 3eb1c80..e4aaa7d 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;