tony2001 Thu Jun 2 11:42:59 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/odbc php_odbc.c
/php-src NEWS
Log:
MFH: fix bug #33214 (odbc_next_result does not signal SQL errors with
2-statement SQL batches).
Path by rich at kastle dot com.
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.143.2.20&r2=1.143.2.21&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.143.2.20
php-src/ext/odbc/php_odbc.c:1.143.2.21
--- php-src/ext/odbc/php_odbc.c:1.143.2.20 Tue Jan 18 10:11:22 2005
+++ php-src/ext/odbc/php_odbc.c Thu Jun 2 11:42:58 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.143.2.20 2005/01/18 15:11:22 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.143.2.21 2005/06/02 15:42:58 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2436,8 +2436,10 @@
result->values = NULL;
}
RETURN_TRUE;
- }
- else {
+ } else if (rc == SQL_NO_DATA_FOUND) {
+ RETURN_FALSE;
+ } else {
+ odbc_sql_error(result->conn_ptr, result->stmt,
"SQLMoreResults");
RETURN_FALSE;
}
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.917&r2=1.1247.2.918&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.917 php-src/NEWS:1.1247.2.918
--- php-src/NEWS:1.1247.2.917 Thu Jun 2 04:31:38 2005
+++ php-src/NEWS Thu Jun 2 11:42:58 2005
@@ -8,6 +8,8 @@
- Changed sha1_file() and md5_file() functions to use streams instead of
low level IO. (Uwe)
- Fixed memory corruption in stristr(). (Derick)
+- Fixed bug #33214 (odbc_next_result does not signal SQL errors with
+ 2-statement SQL batches). (rich at kastle dot com, Tony)
- Fixed bug #33210 (relax jpeg recursive loop protection). (Ilia)
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier
misbehave). (Jani)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
