1 commit 3c55eef24050cec9e50e98e2f5fc12cd45f1ef8a
2 Author: Jeremy Harris <jgh146exb@wizmail.org>
3 Date: Fri Apr 5 15:22:20 2019 +0100
5 Logging: close logfile when non-smtp input is taking a long time. Bug 1891
7 diff --git a/src/src/receive.c b/src/src/receive.c
8 index 0cb38626..64f62757 100644
9 --- a/src/src/receive.c
10 +++ b/src/src/receive.c
11 @@ -571,6 +571,30 @@ return FALSE;
15 +/* Pause for a while waiting for input. If none received in that time,
16 +close the logfile, if we had one open; then if we wait for a long-running
17 +datasource (months, in one use-case) log rotation will not leave us holding
23 +if (!receive_timeout)
26 + timesince(&t, &received_time);
27 + if (t.tv_sec > 30*60)
32 + FD_ZERO(&r); FD_SET(0, &r);
33 + t.tv_sec = 30*60 - t.tv_sec; t.tv_usec = 0;
34 + if (select(1, &r, NULL, NULL, &t) == 0) mainlog_close();
39 /*************************************************
40 * Read data portion of a non-SMTP message *
41 *************************************************/
42 @@ -619,9 +643,11 @@ register int linelength = 0;
46 - register int last_ch = '\n';
49 - for (; (ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF; last_ch = ch)
51 + log_close_chk(), (ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF;
54 if (ch == 0) body_zerocount++;
55 if (last_ch == '\r' && ch != '\n')
56 @@ -663,7 +689,7 @@ if (!f.dot_ends)
60 -while ((ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF)
61 +while (log_close_chk(), (ch = (receive_getc)(GETC_BUFFER_UNLIMITED)) != EOF)
63 if (ch == 0) body_zerocount++;