diff options
| author | Xinchen Hui <laruence@php.net> | 2015-06-04 21:08:57 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-06-04 21:08:57 +0800 |
| commit | 93b7ba4c9ff85f171c8f81967032e81223b85397 (patch) | |
| tree | 9b36c582f3a5fd4ae5d3e086c29e14b319cb7801 /ext/date | |
| parent | e96c64ed5e0786c067259ad8728ded0085762632 (diff) | |
| parent | 9a0bdd9069bea0bc8decff365f8e4d5adee27ef8 (diff) | |
| download | php-git-93b7ba4c9ff85f171c8f81967032e81223b85397.tar.gz | |
Merge branch 'PHP-5.5' into 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 9d3b53c12a..6169f40690 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -885,6 +885,10 @@ PHP_MSHUTDOWN_FUNCTION(date) timelib_error_container_dtor(DATEG(last_errors)); } +#ifndef ZTS + DATEG(default_timezone) = NULL; +#endif + return SUCCESS; } /* }}} */ |