tony2001 Tue Mar 18 14:44:36 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pdo pdo_dbh.c
Log:
remove ze1_compat leftovers
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_dbh.c?r1=1.82.2.31.2.17.2.8&r2=1.82.2.31.2.17.2.9&diff_format=u
Index: php-src/ext/pdo/pdo_dbh.c
diff -u php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.8
php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.9
--- php-src/ext/pdo/pdo_dbh.c:1.82.2.31.2.17.2.8 Mon Mar 10 22:12:35 2008
+++ php-src/ext/pdo/pdo_dbh.c Tue Mar 18 14:44:35 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.8 2008/03/10 22:12:35 felipe Exp $ */
+/* $Id: pdo_dbh.c,v 1.82.2.31.2.17.2.9 2008/03/18 14:44:35 tony2001 Exp $ */
/* The PDO Database Handle Class */
@@ -1314,14 +1314,7 @@
return -1;
}
-static zend_object_value dbh_ze1_clone_obj(zval *object TSRMLS_DC)
-{
- php_error(E_ERROR, "Cannot clone object of class %s due to
'zend.ze1_compatibility_mode'", Z_OBJCE_P(object)->name);
- return object->value.obj;
-}
-
static zend_object_handlers pdo_dbh_object_handlers;
-static zend_object_handlers pdo_dbh_object_handlers_ze1;
void pdo_dbh_init(TSRMLS_D)
{
@@ -1335,11 +1328,6 @@
pdo_dbh_object_handlers.get_method = dbh_method_get;
pdo_dbh_object_handlers.compare_objects = dbh_compare;
- memcpy(&pdo_dbh_object_handlers_ze1, &std_object_handlers,
sizeof(zend_object_handlers));
- pdo_dbh_object_handlers_ze1.get_method = dbh_method_get;
- pdo_dbh_object_handlers_ze1.compare_objects = dbh_compare;
- pdo_dbh_object_handlers_ze1.clone_obj = dbh_ze1_clone_obj;
-
REGISTER_PDO_CLASS_CONST_LONG("PARAM_BOOL", (long)PDO_PARAM_BOOL);
REGISTER_PDO_CLASS_CONST_LONG("PARAM_NULL", (long)PDO_PARAM_NULL);
REGISTER_PDO_CLASS_CONST_LONG("PARAM_INT", (long)PDO_PARAM_INT);
@@ -1527,7 +1515,7 @@
dbh->def_stmt_ce = pdo_dbstmt_ce;
retval.handle = zend_objects_store_put(dbh,
(zend_objects_store_dtor_t)zend_objects_destroy_object,
(zend_objects_free_object_storage_t)pdo_dbh_free_storage, NULL TSRMLS_CC);
- retval.handlers = EG(ze1_compatibility_mode) ?
&pdo_dbh_object_handlers_ze1 : &pdo_dbh_object_handlers;
+ retval.handlers = &pdo_dbh_object_handlers;
return retval;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
