diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 7 | ||||
| -rw-r--r-- | src/src/exigrep.src | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index a2c706359..4cc306291 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.50 2004/12/21 11:12:13 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.51 2004/12/21 11:28:38 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -218,6 +218,11 @@ Exim version 4.50 have made the code more robust (and fixed the comments that describe what is going on). +53. Now that there can be additional text after "Completed" in log lines (if + the queue_time_overall log selector is set), a one-byte patch to exigrep + was needed to allow it to recognize "Completed" as not the last thing in + the line. + Exim version 4.43 ----------------- diff --git a/src/src/exigrep.src b/src/src/exigrep.src index bcd359735..e824bb41c 100644 --- a/src/src/exigrep.src +++ b/src/src/exigrep.src @@ -1,5 +1,5 @@ #! PERL_COMMAND -w -# $Cambridge: exim/src/src/exigrep.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $ +# $Cambridge: exim/src/src/exigrep.src,v 1.2 2004/12/21 11:28:38 ph10 Exp $ use strict; @@ -81,7 +81,7 @@ if (my($id) = $entry =~ /^(\w{6}\-\w{6}\-\w{2})/) # print it, but in any event, throw away what was saved. if ($entry =~ - /(?:Completed$|rejected (?:by local_scan|by non-SMTP ACL|after DATA))/) + /(?:Completed|rejected (?:by local_scan|by non-SMTP ACL|after DATA))/) { if ($saved{$id} =~ /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d ([+-]\d{4} )?)(\w{6}\-\w{6}\-\w{2})/) { |