diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2004-12-20 11:46:21 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2004-12-20 11:46:21 +0000 |
| commit | a444213a3484d4236c044558a7e1cf5a56183996 (patch) | |
| tree | 25a9ec07b7a491e9035ac7bbf675824a2bfb1302 | |
| parent | f7b639017a889d802b26b61df6b3f1ac46c6f4f0 (diff) | |
Reset locale after calling embedded Perl, in case it was changed.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/perl.c | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 110a02f7d..181fa93bb 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.43 2004/12/17 14:52:44 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.44 2004/12/20 11:46:21 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -187,6 +187,9 @@ Exim version 4.50 introduction of TLS in release 3.20, but "sometimes" must have been rare because the tests only now provoked it. +46. Reset the locale to "C" after calling embedded Perl, in case it was changed + (this can affect the format of dates). + Exim version 4.43 ----------------- diff --git a/src/src/perl.c b/src/src/perl.c index 533d2c47d..a22fe6f40 100644 --- a/src/src/perl.c +++ b/src/src/perl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/perl.c,v 1.1 2004/10/07 10:39:01 ph10 Exp $ */ +/* $Cambridge: exim/src/src/perl.c,v 1.2 2004/12/20 11:46:21 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -167,7 +167,8 @@ call_perl_cat(uschar *yield, int *sizep, int *ptrp, uschar **errstrp, yield = string_cat(yield, sizep, ptrp, str, (int)len); FREETMPS; LEAVE; - + + setlocale(LC_ALL, "C"); /* In case it got changed */ return yield; } |