helly Thu May 26 07:53:21 2005 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
- Make SQLiteDatabase derivable by dropping final tag from class and
making the ctor final to ensure it is being called, which is the problem.
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.160&r2=1.161&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.160 php-src/ext/sqlite/sqlite.c:1.161
--- php-src/ext/sqlite/sqlite.c:1.160 Mon Apr 18 22:58:19 2005
+++ php-src/ext/sqlite/sqlite.c Thu May 26 07:53:16 2005
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.160 2005/04/19 02:58:19 iliaa Exp $
+ $Id: sqlite.c,v 1.161 2005/05/26 11:53:16 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1013,6 +1013,10 @@
#else
REGISTER_SQLITE_CLASS(Exception, exception,
zend_exception_get_default());
#endif
+
+ sqlite_ce_db->ce_flags &= ~ZEND_ACC_FINAL_CLASS;
+ sqlite_ce_db->constructor->common.fn_flags |= ZEND_ACC_FINAL;
+
sqlite_object_handlers_query.get_class_entry = sqlite_get_ce_query;
sqlite_object_handlers_ub_query.get_class_entry =
sqlite_get_ce_ub_query;
sqlite_object_handlers_ub_query.count_elements = sqlite_count_elements;
@@ -1104,7 +1108,7 @@
{
php_info_print_table_start();
php_info_print_table_header(2, "SQLite support", "enabled");
- php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.160 2005/04/19 02:58:19 iliaa Exp
$");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.161 2005/05/26 11:53:16 helly Exp
$");
php_info_print_table_row(2, "SQLite Library", sqlite_libversion());
php_info_print_table_row(2, "SQLite Encoding", sqlite_libencoding());
php_info_print_table_end();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
