com php-src: Fixed invalid read druing apache reload: ext/date/php_date.c
| From: | Xinchen Hui | Date: | Thu, 04 Jun 2015 13:08:36 +0000 |
| Subject: | com php-src: Fixed invalid read druing apache reload: ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87062@lists.php.net to get a copy of this message | ||
Commit: 9a0bdd9069bea0bc8decff365f8e4d5adee27ef8
Author: Xinchen Hui <laruence@php.net> Thu, 4 Jun 2015 21:08:36 +0800
Parents: 1cbd25ca15383394ffa9ee8601c5de4c0f2f90e1
Branches: PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9a0bdd9069bea0bc8decff365f8e4d5adee27ef8
Log:
Fixed invalid read druing apache reload
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 12d9ea7...5071e2e 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -877,6 +877,10 @@ PHP_MSHUTDOWN_FUNCTION(date)
timelib_error_container_dtor(DATEG(last_errors));
}
+#ifndef ZTS
+ DATEG(default_timezone) = NULL;
+#endif
+
return SUCCESS;
}
/* }}} */