]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Apr 2019 09:42:55 +0000 (11:42 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 15 Apr 2019 09:42:55 +0000 (11:42 +0200)
1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/pdo/pdo_stmt.c
ext/simplexml/simplexml.c

Simple merge
Simple merge
Simple merge
index cf459311b7f1bd31f52dcfdc78e4393b8fbe3f84,e8ba1f505a0bc7911bc10a0dc61f7aab3fba9747..7925acb334cc6b609ac6cd3d970715016aea0220
@@@ -1024,8 -1016,9 +1024,9 @@@ static int sxe_prop_is_empty(zend_objec
        zval             iter_data;
        int              test;
        int              is_empty;
+       int              use_iter = 0;
  
 -      sxe = Z_SXEOBJ_P(object);
 +      sxe = php_sxe_fetch_object(object);
  
        GET_NODE(sxe, node);
        if (!node) {