Index: plperl.c
===================================================================
RCS file: /cvsroot/pgsql/src/pl/plperl/plperl.c,v
retrieving revision 1.98
diff -c -r1.98 plperl.c
*** plperl.c	29 Dec 2005 14:28:31 -0000	1.98
--- plperl.c	8 Jan 2006 16:54:53 -0000
***************
*** 45,50 ****
--- 45,51 ----
  #include <ctype.h>
  #include <fcntl.h>
  #include <unistd.h>
+ #include <locale.h>
  
  /* postgreSQL stuff */
  #include "commands/trigger.h"
***************
*** 263,268 ****
--- 264,303 ----
  		"", "-e", PERLBOOT
  	};
  
+ #ifdef WIN32
+ 
+ 	/* 
+ 	 * The perl library on startup does horrible things like call
+ 	 * setlocale(LC_ALL,""). We have protected against that on most
+ 	 * platforms by setting the environment appropriately. However, on
+ 	 * Windows, setlocale() does not consult the environment, so we need
+ 	 * to save the excisting locale settings before perl has a chance to 
+ 	 * mangle them and restore them after its dirty deeds are done.
+ 	 *
+ 	 * MSDN ref:
+ 	 * http://msdn.microsoft.com/library/en-us/vclib/html/_crt_locale.asp
+ 	 *
+ 	 * It appaers that we only need to do this on interpreter startup, and
+ 	 * subsequent calls to the interpreter don't mess with the locale
+ 	 * settings.
+ 	 */
+ 
+ 	char *loc;
+ 	char *save_collate, *save_ctype, *save_monetary, *save_numeric, *save_time;
+ 
+ 	loc = setlocale(LC_COLLATE,NULL);
+ 	save_collate = loc ? pstrdup(loc) : NULL;
+ 	loc = setlocale(LC_CTYPE,NULL);
+ 	save_ctype = loc ? pstrdup(loc) : NULL;
+ 	loc = setlocale(LC_MONETARY,NULL);
+ 	save_monetary = loc ? pstrdup(loc) : NULL;
+ 	loc = setlocale(LC_NUMERIC,NULL);
+ 	save_numeric = loc ? pstrdup(loc) : NULL;
+ 	loc = setlocale(LC_TIME,NULL);
+ 	save_time = loc ? pstrdup(loc) : NULL;
+ 
+ #endif
+ 
  	plperl_interp = perl_alloc();
  	if (!plperl_interp)
  		elog(ERROR, "could not allocate Perl interpreter");
***************
*** 272,277 ****
--- 307,328 ----
  	perl_run(plperl_interp);
  
  	plperl_proc_hash = newHV();
+ 
+ #ifdef WIN32
+ 
+ 	if (save_collate != NULL)
+ 	  setlocale(LC_COLLATE,save_collate);
+ 	if (save_ctype != NULL)
+ 	  setlocale(LC_CTYPE,save_ctype);
+ 	if (save_monetary != NULL)
+ 	  setlocale(LC_MONETARY,save_monetary);
+ 	if (save_numeric != NULL)
+ 	  setlocale(LC_NUMERIC,save_numeric);
+ 	if (save_time != NULL)
+ 	  setlocale(LC_TIME,save_time);
+ 
+ #endif
+ 
  }
  
  
