diff options
| author | Xinchen Hui <laruence@php.net> | 2015-06-04 21:09:06 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-06-04 21:09:06 +0800 |
| commit | c6db18f9ab0f512df573bca9538f1aace9a1a6d2 (patch) | |
| tree | 31def2f0225438163f4b35f82247d2e6922043d7 /ext/date | |
| parent | adb5f93f8514fc588a4d6740eaf1fea8b261bbb6 (diff) | |
| parent | 93b7ba4c9ff85f171c8f81967032e81223b85397 (diff) | |
| download | php-git-c6db18f9ab0f512df573bca9538f1aace9a1a6d2.tar.gz | |
Merge branch 'PHP-5.6'
Diffstat (limited to 'ext/date')
| -rw-r--r-- | ext/date/php_date.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 4ca8d19e24..d8d6d32862 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -889,6 +889,10 @@ PHP_MSHUTDOWN_FUNCTION(date) timelib_error_container_dtor(DATEG(last_errors)); } +#ifndef ZTS + DATEG(default_timezone) = NULL; +#endif + return SUCCESS; } /* }}} */ |