]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorJoe Watkins <krakjoe@php.net>
Mon, 11 Mar 2019 23:37:28 +0000 (00:37 +0100)
committerJoe Watkins <krakjoe@php.net>
Mon, 11 Mar 2019 23:37:28 +0000 (00:37 +0100)
* PHP-7.4:
  zend_weakrefs

1  2 
Zend/zend_execute_API.c
Zend/zend_globals.h
Zend/zend_objects.c
Zend/zend_types.h
configure.ac
ext/com_dotnet/com_handlers.c
ext/com_dotnet/com_saproxy.c

Simple merge
index 07d13f65b425d41071a0bf0ab88c8a5f0cda1f81,2f46da0c2d3f633f11d4bf2be98b494619685ee5..b665c4e9cadd776a54a11707b5385f049602b9af
@@@ -225,6 -225,10 +225,8 @@@ struct _zend_executor_globals 
        zend_function trampoline;
        zend_op       call_trampoline_op;
  
 -      zend_bool each_deprecation_thrown;
 -
+       HashTable weakrefs;
        void *reserved[ZEND_MAX_RESERVED_RESOURCES];
  };
  
Simple merge
Simple merge
diff --cc configure.ac
Simple merge
index 4f64b5502e8e69cf6e668e2c05e11478e6b170f0,0a4693fec5ff2ff215fa4f723b952e570cf048cc..d00cb14f14bfa914031171c3de8ff45edba98b63
@@@ -612,9 -615,11 +612,11 @@@ void php_com_object_free_storage(zend_o
                zend_hash_destroy(obj->id_of_name_cache);
                FREE_HASHTABLE(obj->id_of_name_cache);
        }
+       zend_object_std_dtor(object);
  }
  
 -zend_object* php_com_object_clone(zval *object)
 +zend_object* php_com_object_clone(zend_object *object)
  {
        php_com_dotnet_object *cloneobj, *origobject;
  
index 225786bde888dade5d2621354b955239cd99b77d,7eec446a3f94a818b863f429f355e5613007a717..ebef6430a37d9826bbd2c0ab585aa53548584cb6
@@@ -368,7 -374,9 +368,10 @@@ static void saproxy_free_storage(zend_o
  //???         }
  //??? }
  
 -      zval_ptr_dtor(proxy->zobj);
 +      OBJ_RELEASE(&proxy->obj->zo);
++
+       zend_object_std_dtor(object);
        efree(proxy->indices);
  }