com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pcre/php _pcre.c

From: Date: Thu, 14 Mar 2013 13:39:09 +0000
Subject: com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/pcre/php _pcre.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-71456@lists.php.net to get a copy of this message
Commit: 5df8cf19759c77ee05fe6eecba7088caecbe132e Author: Anatol Belski <ab@php.net> Thu, 14 Mar 2013 14:39:09 +0100 Parents: 0777a18703d9be2ea8efd85c0352863b8768e49e e43c5a83957c6a9953a74b5403a5f1d5ae341770 Branches: PHP-5.4 PHP-5.5 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5df8cf19759c77ee05fe6eecba7088caecbe132e Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: fix zts check Changed paths: MM ext/pcre/php_pcre.c Diff: diff --cc ext/pcre/php_pcre.c index 20fb2a2,fe72dbc..0d5d505 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@@ -248,10 -248,9 +248,10 @@@ PHPAPI pcre_cache_entry* pcre_get_compi #endif pcre_cache_entry *pce; pcre_cache_entry new_entry; + char *tmp = NULL; #if HAVE_SETLOCALE - # ifdef PHP_WIN32 && ZTS + # if defined(PHP_WIN32) && defined(ZTS) _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); # endif locale = setlocale(LC_CTYPE, NULL);

« previous php.cvs (#71456) next »