wez Fri Jul 22 00:33:58 2005 EDT
Modified files:
/php-src/ext/pdo pdo_stmt.c
Log:
this looks like a much better fix for refcounting/shutdown in lazy objects.
http://cvs.php.net/diff.php/php-src/ext/pdo/pdo_stmt.c?r1=1.114&r2=1.115&ty=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.114 php-src/ext/pdo/pdo_stmt.c:1.115
--- php-src/ext/pdo/pdo_stmt.c:1.114 Thu Jul 21 22:09:19 2005
+++ php-src/ext/pdo/pdo_stmt.c Fri Jul 22 00:33:56 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.114 2005/07/22 02:09:19 wez Exp $ */
+/* $Id: pdo_stmt.c,v 1.115 2005/07/22 04:33:56 wez Exp $ */
/* The PDO Statement Handle Class */
@@ -222,7 +222,7 @@
Z_TYPE(stmt->lazy_object_ref) = IS_OBJECT;
Z_OBJ_HANDLE(stmt->lazy_object_ref) =
zend_objects_store_put(stmt,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t)pdo_row_free_storage, NULL TSRMLS_CC);
Z_OBJ_HT(stmt->lazy_object_ref) = &pdo_row_object_handlers;
- stmt->refcount++;
+ /* stmt->refcount++; */
}
Z_TYPE_P(return_value) = IS_OBJECT;
Z_OBJ_HANDLE_P(return_value) = Z_OBJ_HANDLE(stmt->lazy_object_ref);
@@ -2311,11 +2311,13 @@
void pdo_row_free_storage(pdo_stmt_t *stmt TSRMLS_DC)
{
+#if 0
ZVAL_NULL(&stmt->lazy_object_ref);
if (--stmt->refcount == 0) {
free_statement(stmt TSRMLS_CC);
}
+#endif
}
zend_object_value pdo_row_new(zend_class_entry *ce TSRMLS_DC)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
