wez Sat Sep 25 21:41:40 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/sqlite sqlite.c
Log:
MFH: Fix bug #30147 OO sqlite_fetch_object did not reset error handler
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.83&r2=1.1760.2.84&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.83 php-src/NEWS:1.1760.2.84
--- php-src/NEWS:1.1760.2.83 Sat Sep 25 21:14:59 2004
+++ php-src/NEWS Sat Sep 25 21:41:39 2004
@@ -1,6 +1,7 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, PHP 5.0.3
+- Fixed bug #30147 (OO sqlite_fetch_object did not reset error handler). (Wez)
- Fixed bug #30057 (did not detect IPV6 on FreeBSD 4.1). (Wez)
23 Sep 2004, PHP 5.0.2
http://cvs.php.net/diff.php/php-src/ext/sqlite/sqlite.c?r1=1.146.2.2&r2=1.146.2.3&ty=u
Index: php-src/ext/sqlite/sqlite.c
diff -u php-src/ext/sqlite/sqlite.c:1.146.2.2 php-src/ext/sqlite/sqlite.c:1.146.2.3
--- php-src/ext/sqlite/sqlite.c:1.146.2.2 Mon Aug 2 18:43:42 2004
+++ php-src/ext/sqlite/sqlite.c Sat Sep 25 21:41:40 2004
@@ -17,7 +17,7 @@
| Marcus Boerger <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: sqlite.c,v 1.146.2.2 2004/08/02 22:43:42 iliaa Exp $
+ $Id: sqlite.c,v 1.146.2.3 2004/09/26 01:41:40 wez Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1071,7 +1071,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.146.2.2 2004/08/02 22:43:42 iliaa Exp $");
+ php_info_print_table_row(2, "PECL Module version", PHP_SQLITE_MODULE_VERSION "
$Id: sqlite.c,v 1.146.2.3 2004/09/26 01:41:40 wez 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();
@@ -1969,6 +1969,7 @@
if (res->curr_row < res->nrows) {
php_sqlite_fetch_array(res, PHPSQLITE_ASSOC, decode_binary, 1,
&dataset TSRMLS_CC);
} else {
+ php_std_error_handling();
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
