com php-src: Maybe fix bug #72011: ext/date/php_date.c
| From: | Nikita Popov | Date: | Tue, 14 Jun 2016 20:37:27 +0000 |
| Subject: | com php-src: Maybe fix bug #72011: ext/date/php_date.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92388@lists.php.net to get a copy of this message | ||
Commit: 248fdfcf7356f2c20ab1e6afd1e9f295d08331c7
Author: Nikita Popov <nikic@php.net> Tue, 14 Jun 2016 22:36:09 +0200
Parents: 1ab5a1b432a4b4c62171864bd1b545616e1b07db
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=248fdfcf7356f2c20ab1e6afd1e9f295d08331c7
Log:
Maybe fix bug #72011
Bugs:
https://bugs.php.net/72011
Changed paths:
M ext/date/php_date.c
Diff:
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 750800d..801208d 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2059,6 +2059,7 @@ static void date_register_classes(TSRMLS_D)
date_object_handlers_immutable.clone_obj = date_object_clone_date;
date_object_handlers_immutable.compare_objects = date_object_compare_date;
date_object_handlers_immutable.get_properties = date_object_get_properties;
+ date_object_handlers_immutable.get_gc = date_object_get_gc;
zend_class_implements(date_ce_immutable TSRMLS_CC, 1, date_ce_interface);
INIT_CLASS_ENTRY(ce_timezone, "DateTimeZone", date_funcs_timezone);
@@ -2225,7 +2226,7 @@ static HashTable *date_object_get_properties(zval *object TSRMLS_DC)
props = zend_std_get_properties(object TSRMLS_CC);
- if (!dateobj->time || GC_G(gc_active)) {
+ if (!dateobj->time) {
return props;
}
@@ -4941,7 +4942,7 @@ static HashTable *date_object_get_properties_period(zval *object TSRMLS_DC)
props = zend_std_get_properties(object TSRMLS_CC);
- if (!period_obj->start || GC_G(gc_active)) {
+ if (!period_obj->start) {
return props;
}