Patch pecl-spread-54.patch for spread Bug #67797

Patch version 2014-08-06 14:06 UTC

• 2014-08-06 14:06 UTC [diff to current]

Developer: j.david.lists@gmail.com

--- spread-2.1.0/php_spread.c   2008-10-22 16:42:20.000000000 +0000
+++ spread-2.1.0+/php_spread.c  2014-08-06 13:55:06.000000000 +0000
@@ -45,7 +45,7 @@
 static int le_conn;
 
 /* {{{ arginfo */
-static
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_spread_connect, 0, 0, 1)
    ZEND_ARG_INFO(0, spread_daemon)
    ZEND_ARG_INFO(0, private_name)
@@ -105,7 +105,7 @@
 
 /* {{{ spread_functions[] */
 
-function_entry spread_functions[] = {
+zend_function_entry spread_functions[] = {
    PHP_FE(spread_connect, arginfo_spread_connect)
    PHP_FE(spread_multicast, arginfo_spread_multicast)
    PHP_FE(spread_disconnect, arginfo_spread_disconnect)
@@ -170,7 +170,8 @@
 
    ALLOC_HASHTABLE(intern->zo.properties);
    zend_hash_init(intern->zo.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
-   zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
+   /* zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *)); */
+   object_properties_init( ( zend_object * ) & ( intern->zo ), class_type );
 
    retval.handle = zend_objects_store_put(intern, NULL, (zend_objects_free_object_storage_t) spread_object_free_storage, NULL TSRMLS_CC);
 
@@ -423,7 +424,7 @@
    mailbox *mbox = NULL;
    char private_group[MAX_GROUP_NAME];
    int rsrc_id;
-   list_entry *le;
+   zend_rsrc_list_entry *le;
 
 #ifdef ZEND_ENGINE_2
    zval *this = getThis();