com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/date/php _date.c

From: Date: Tue, 12 Feb 2019 08:57:18 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/date/php _date.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-104577@lists.php.net to get a copy of this message
Commit: 8ed775f548d2535b87ff439f0b0a04b7770ed914 Author: Nikita Popov <nikita.ppv@gmail.com> Tue, 12 Feb 2019 09:57:18 +0100 Parents: c553d17f11bab2ef347bc7e72a4e9c55217524f1 a109fddba4e3fbb6e3a2e008c0fa20a57f26103d Branches: PHP-7.3 PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8ed775f548d2535b87ff439f0b0a04b7770ed914 Log: Merge branch 'PHP-7.2' into PHP-7.3 Changed paths: MM ext/date/php_date.c Diff: diff --cc ext/date/php_date.c index 7b1836e,c8479b5..32530ef --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -5283,13 -5285,7 +5282,7 @@@ static zval *date_period_read_property( Z_OBJPROP_P(object); /* build properties hash table */ - zv = zend_std_read_property(object, member, type, cache_slot, rv); - if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) { - /* defensive copy */ - ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(zv)); - } - - return zv; - return std_object_handlers.read_property(object, member, type, cache_slot, rv); ++ return zend_std_read_property(object, member, type, cache_slot, rv); } /* }}} */

« previous php.cvs (#104577) next »