iliaa Tue Apr 18 14:30:16 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/sqlite sqlite.c
/php-src NEWS
Log:
Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/sqlite.c?r1=1.166.2.12&r2=1.166.2.13&diff_format=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.166.2.12
php-src/ext/sqlite/sqlite.c:1.166.2.13
--- php-src/ext/sqlite/sqlite.c:1.166.2.12 Wed Mar 29 14:28:42 2006
+++ php-src/ext/sqlite/sqlite.c Tue Apr 18 14:30:15 2006
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.166.2.12 2006/03/29 14:28:42 tony2001 Exp $
+ $Id: sqlite.c,v 1.166.2.13 2006/04/18 14:30:15 iliaa Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1124,7 +1124,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.166.2.12 2006/03/29 14:28:42
tony2001 Exp $");
+ php_info_print_table_row(2, "PECL Module version",
PHP_SQLITE_MODULE_VERSION " $Id: sqlite.c,v 1.166.2.13 2006/04/18 14:30:15
iliaa 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();
@@ -1705,7 +1705,9 @@
add_index_string(return_value, i, colnames[ncols + i] ?
(char *)colnames[ncols + i] : "", 1);
}
}
-
+ if (res.vm) {
+ sqlite_finalize(res.vm, NULL);
+ }
done:
sqlite_exec(db->db, "PRAGMA show_datatypes = OFF", NULL, NULL, NULL);
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.519&r2=1.2027.2.520&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.519 php-src/NEWS:1.2027.2.520
--- php-src/NEWS:1.2027.2.519 Tue Apr 18 13:07:59 2006
+++ php-src/NEWS Tue Apr 18 14:30:16 2006
@@ -24,6 +24,8 @@
- Fixed Bug #36872 (session_destroy() fails after call to
session_regenerate_id(true)). (Ilia)
- Fixed bug #36513 (comment will be outputed in last line). (Dmitry)
+- Fixed bug #29476 (sqlite_fetch_column_types() locks the database forever).
+ (Ilia)
06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
