git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
512314e
)
Fix the way ${extract is skipped in the untaken branch of a conditional.
author
Tony Finch
<dot@dot.at>
Thu, 7 Aug 2008 11:05:03 +0000
(11:05 +0000)
committer
Tony Finch
<dot@dot.at>
Thu, 7 Aug 2008 11:05:03 +0000
(11:05 +0000)
doc/doc-txt/ChangeLog
patch
|
blob
|
history
src/src/expand.c
patch
|
blob
|
history
diff --git
a/doc/doc-txt/ChangeLog
b/doc/doc-txt/ChangeLog
index 347796353d6855ca66cf9b02e62616d84f08c028..425e1551245fb349326dcd4a4e223e6fc7a5d832 100644
(file)
--- a/
doc/doc-txt/ChangeLog
+++ b/
doc/doc-txt/ChangeLog
@@
-1,4
+1,4
@@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.55
0 2008/07/28 18:46:44
fanf2 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.55
1 2008/08/07 11:05:03
fanf2 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
Change log file for Exim from version 4.21
-------------------------------------------
@@
-60,6
+60,8
@@
TF/05 Leading white space used to be stripped from $spam_report which
TF/06 Save $spam_score, $spam_bar, and $spam_report in spool files, so
that they are available at delivery time.
TF/06 Save $spam_score, $spam_bar, and $spam_report in spool files, so
that they are available at delivery time.
+TF/07 Fix the way ${extract is skipped in the untaken branch of a conditional.
+
Exim version 4.69
-----------------
Exim version 4.69
-----------------
diff --git
a/src/src/expand.c
b/src/src/expand.c
index fc203ac59853c728981385cb0385a385ef13e331..cd84294ae59ad66799451a153f718c532c48bf4c 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/expand.c,v 1.9
5 2008/05/22 10:56:27
fanf2 Exp $ */
+/* $Cambridge: exim/src/src/expand.c,v 1.9
6 2008/08/07 11:05:03
fanf2 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-4659,7
+4659,7
@@
while (*s != 0)
while (len > 0 && isspace(p[len-1])) len--;
p[len] = 0;
while (len > 0 && isspace(p[len-1])) len--;
p[len] = 0;
- if (*p == 0)
+ if (*p == 0
&& !skipping
)
{
expand_string_message = US"first argument of \"extract\" must "
"not be empty";
{
expand_string_message = US"first argument of \"extract\" must "
"not be empty";