cvs: php-src /ext/sqlite sqlite.c
| From: | Marcus Boerger | Date: | Sat, 27 Dec 2003 22:11:50 +0000 |
| Subject: | cvs: php-src /ext/sqlite sqlite.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-25450@lists.php.net to get a copy of this message | ||
helly Sat Dec 27 17:11:50 2003 EDT
Modified files:
/php-src/ext/sqlite sqlite.c
Log:
Bugfix #25329
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.105 php-src/ext/sqlite/sqlite.c:1.106
--- php-src/ext/sqlite/sqlite.c:1.105 Thu Dec 18 16:28:00 2003
+++ php-src/ext/sqlite/sqlite.c Sat Dec 27 17:11:48 2003
@@ -17,7 +17,7 @@
| Marcus Boerger <helly@php.net> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.105 2003/12/18 21:28:00 iliaa Exp $
+ $Id: sqlite.c,v 1.106 2003/12/27 22:11:48 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -375,6 +375,9 @@
{
struct php_sqlite_db *db;
+ /* 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;
}
@@ -386,9 +389,6 @@
/* don't leave pending commits hanging around */
sqlite_exec(db->db, "ROLLBACK", NULL, NULL, NULL);
- /* 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);
-
return 0;
}
@@ -1073,7 +1073,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.105 2003/12/18 21:28:00 iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION " $Id:
sqlite.c,v 1.106 2003/12/27 22:11:48 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();