com php-src: Bug #71596 Segmentation fault on ZTS with date function (setlocale): main/main.c
| From: | Anatol Belski | Date: | Thu, 18 Feb 2016 18:13:07 +0000 |
| Subject: | com php-src: Bug #71596 Segmentation fault on ZTS with date function (setlocale): main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-91098@lists.php.net to get a copy of this message | ||
Commit: 632fc51d98494565a71ae97a81bd7d440dbb116a
Author: Anatol Belski <ab@php.net> Thu, 18 Feb 2016 19:13:07 +0100
Parents: a329dc70e94ab9f5e98e4bac0883adc1b3f8d635
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=632fc51d98494565a71ae97a81bd7d440dbb116a
Log:
Bug #71596 Segmentation fault on ZTS with date function (setlocale)
Bugs:
https://bugs.php.net/71596
Changed paths:
M main/main.c
Diff:
diff --git a/main/main.c b/main/main.c
index 877507d..ab55b5b 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1622,6 +1622,9 @@ int php_request_startup(TSRMLS_D)
#endif /* HAVE_DTRACE */
#ifdef PHP_WIN32
+# if defined(ZTS)
+ _configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+# endif
PG(com_initialized) = 0;
#endif