diff options
author | Phil Pennock <pdp@exim.org> | 2011-02-20 23:44:50 -0500 |
---|---|---|
committer | Phil Pennock <pdp@exim.org> | 2011-02-20 23:45:22 -0500 |
commit | 332f5cf3ddb43e1a85d70039211e73aa1a753ebd (patch) | |
tree | dcff58d76b286cdd4c4b54addcb116d712f1d889 /doc | |
parent | cd59ab18b06626887aecef760c416ae7936924da (diff) |
Update $message_linecount for maildir_tag.
Patch from Mark Zealey.
Fixes bug 1055.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/doc-docbook/spec.xfpt | 11 | ||||
-rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
-rw-r--r-- | doc/doc-txt/NewStuff | 4 |
3 files changed, 16 insertions, 2 deletions
diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt index bc9dd2e14..15f104d2b 100644 --- a/doc/doc-docbook/spec.xfpt +++ b/doc/doc-docbook/spec.xfpt @@ -11137,8 +11137,15 @@ number of lines received. Before delivery happens (that is, before filters, routers, and transports run) the count is increased to include the &'Received:'& header line that Exim standardly adds, and also any other header lines that are added by ACLs. The blank line that separates the message header -from the body is not counted. Here is an example of the use of this variable in -a DATA ACL: +from the body is not counted. + +As with the special case of &$message_size$&, during the expansion of the +appendfile transport's maildir_tag option in maildir format, the value of +&$message_linecount$& is the precise size of the number of newlines in the +file that has been written (minus one for the blank line between the +header and the body). + +Here is an example of the use of this variable in a DATA ACL: .code deny message = Too many lines in message header condition = \ diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 862f1b887..1fd7bd3cf 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -60,6 +60,9 @@ PP/10 Use sig_atomic_t for flags set from signal handlers. Fixed developed for diagnosis in bug 927 (which turned out to be a kernel bug). +PP/11 Bugzilla 1055: Update $message_linecount for maildir_tag. + Patch from Mark Zealey. + Exim version 4.74 ----------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index 6159bf443..7ae550bb4 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -25,6 +25,10 @@ Version 4.75 3. Log filenames may now use %M as an escape, instead of %D (still available). The %M pattern expands to yyyymm, providing month-level resolution. + 4. The $message_linecount variable is now updated for the maildir_tag option, + in the same way as $message_size, to reflect the real number of lines, + including any header additions or removals from transport. + Version 4.74 ------------ |