helly Thu Jan 15 16:30:33 2004 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Fix shutdown
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.113 php-src/ext/sqlite/sqlite.c:1.114
--- php-src/ext/sqlite/sqlite.c:1.113 Wed Jan 14 16:17:08 2004
+++ php-src/ext/sqlite/sqlite.c Thu Jan 15 16:30:31 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.113 2004/01/14 21:17:08 iliaa Exp $
+ $Id: sqlite.c,v 1.114 2004/01/15 21:30:31 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -367,13 +367,13 @@
{
struct php_sqlite_db *db = (struct php_sqlite_db*)rsrc->ptr;
- /* prevent bad mojo if someone tries to use a previously registered function
in the next request */
- zend_hash_apply(&db->callbacks, (apply_func_t)php_sqlite_callback_invalidator
TSRMLS_CC);
-
if (Z_TYPE_P(rsrc) != le_sqlite_pdb) {
return 0;
}
+ /* prevent bad mojo if someone tries to use a previously registered function
in the next request */
+ zend_hash_apply(&db->callbacks, (apply_func_t)php_sqlite_callback_invalidator
TSRMLS_CC);
+
db->rsrc_id = FAILURE;
/* don't leave pending commits hanging around */
@@ -1058,7 +1058,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.113 2004/01/14 21:17:08 iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.114 2004/01/15 21:30:31 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
