ph10 2006/07/14 15:32:09 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src perl.c
Log:
Reset the locale after initializing Perl, as well as after calling a Perl
function (which it did previously).
Revision Changes Path
1.377 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.5 +2 -0 exim/exim-src/src/perl.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.376
retrieving revision 1.377
diff -u -r1.376 -r1.377
--- ChangeLog 14 Jul 2006 14:21:27 -0000 1.376
+++ ChangeLog 14 Jul 2006 14:32:08 -0000 1.377
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.376 2006/07/14 14:21:27 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.377 2006/07/14 14:32:08 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -110,6 +110,9 @@
PH/19 Added PQsetClientEncoding(conn, "SQL_ASCII") to the pgsql code module.
This is apparently needed in addition to the PH/07 change above to avoid
any possible encoding problems.
+
+PH/20 Perl can change the locale. Exim was resetting it after a ${perl call,
+ but not after initializing Perl.
Exim version 4.62
Index: perl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/perl.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl.c 17 Feb 2005 11:58:26 -0000 1.4
+++ perl.c 14 Jul 2006 14:32:09 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/perl.c,v 1.4 2005/02/17 11:58:26 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/perl.c,v 1.5 2006/07/14 14:32:09 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -129,6 +129,8 @@
perl_eval_sv(sv, G_SCALAR|G_DISCARD|G_KEEPERR);
SvREFCNT_dec(sv);
if (SvTRUE(ERRSV)) return US SvPV(ERRSV, len);
+
+ setlocale(LC_ALL, "C"); /* In case it got changed */
return NULL;
}
}
