johannes Thu, 08 Mar 2012 12:52:12 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=324022
Log: Use correct property ctor, should fix threading issue in bug #55334 # The code was refactored in 5_4/trunk, no need to merge Bug: https://bugs.php.net/55334 (Open) MySQLi make mod_php crash on stress test Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2012-03-08 12:39:48 UTC (rev 324021) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2012-03-08 12:52:12 UTC (rev 324022) @@ -502,7 +502,7 @@ (void **) &intern->prop_handler); zend_object_std_init(&intern->zo, class_type TSRMLS_CC); - zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_add_ref, + zend_hash_copy(intern->zo.properties, &class_type->default_properties, (copy_ctor_func_t) zval_property_ctor, (void *) &tmp, sizeof(zval *)); /* link object */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
