git://git.exim.org
/
users
/
jgh
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
911f6fd
)
Previous patch for $reply_address was incomplete and wrong. This fixes
author
Philip Hazel
<ph10@hermes.cam.ac.uk>
Mon, 12 Dec 2005 12:05:08 +0000
(12:05 +0000)
committer
Philip Hazel
<ph10@hermes.cam.ac.uk>
Mon, 12 Dec 2005 12:05:08 +0000
(12:05 +0000)
it.
src/src/expand.c
patch
|
blob
|
history
diff --git
a/src/src/expand.c
b/src/src/expand.c
index 8fdc2de0984f08fb80475b3b4a9f25780d1bd95e..8523ace2109abd1b4602bee1b02ec9b1e730c741 100644
(file)
--- a/
src/src/expand.c
+++ b/
src/src/expand.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/expand.c,v 1.
49 2005/12/12 11:02:44
ph10 Exp $ */
+/* $Cambridge: exim/src/src/expand.c,v 1.
50 2005/12/12 12:05:08
ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-1428,6
+1428,7
@@
while (last > first)
case vtype_reply: /* Get reply address */
s = find_header(US"reply-to:", exists_only, newsize, TRUE,
headers_charset);
case vtype_reply: /* Get reply address */
s = find_header(US"reply-to:", exists_only, newsize, TRUE,
headers_charset);
+ if (s != NULL) while (isspace(*s)) s++;
if (s == NULL || *s == 0)
{
*newsize = 0; /* For the *s==0 case */
if (s == NULL || *s == 0)
{
*newsize = 0; /* For the *s==0 case */
@@
-1438,6
+1439,8
@@
while (last > first)
uschar *t;
while (isspace(*s)) s++;
for (t = s; *t != 0; t++) if (*t == '\n') *t = ' ';
uschar *t;
while (isspace(*s)) s++;
for (t = s; *t != 0; t++) if (*t == '\n') *t = ' ';
+ while (t > s && isspace(t[-1])) t--;
+ *t = 0;
}
return (s == NULL)? US"" : s;
}
return (s == NULL)? US"" : s;