cvs: php-src /ext/standard basic_functions.c string.c

stas Tue Dec 5 02:54:07 2006 UTC Modified files: /php-src/ext/standard basic_functions.c string.c Log: Merge from 5.2: Improve tolower()-related functions on Windows and VC2005 by caching locale and using tolower_l function. http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.827&r2=1.828&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.827 php-src/ext/standard/basic_functions.c:1.828 --- php-src/ext/standard/basic_functions.c:1.827 Thu Nov 30 21:23:07 2006 +++ php-src/ext/standard/basic_functions.c Tue Dec 5 02:54:07 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.827 2006/11/30 21:23:07 andrei Exp $ */ +/* $Id: basic_functions.c,v 1.828 2006/12/05 02:54:07 stas Exp $ */ #include "php.h" #include "php_streams.h" @@ -4164,6 +4164,7 @@ if (BG(locale_string) != NULL) { setlocale(LC_ALL, "C"); setlocale(LC_CTYPE, ""); + zend_update_current_locale(); } STR_FREE(BG(locale_string)); BG(locale_string) = NULL; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.617&r2=1.618&diff_format=u Index: php-src/ext/standard/string.c diff -u php-src/ext/standard/string.c:1.617 php-src/ext/standard/string.c:1.618 --- php-src/ext/standard/string.c:1.617 Mon Dec 4 18:55:40 2006 +++ php-src/ext/standard/string.c Tue Dec 5 02:54:07 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: string.c,v 1.617 2006/12/04 18:55:40 andrei Exp $ */ +/* $Id: string.c,v 1.618 2006/12/05 02:54:07 stas Exp $ */ /* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */ @@ -6083,6 +6083,7 @@ } retval = setlocale (cat, loc); + zend_update_current_locale(); if (retval) { /* Remember if locale was changed */ if (loc) {