tony2001 Tue Jan 18 10:07:11 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/odbc php_odbc.c
Log:
MFH: fix bug #30430 (odbc_next_result() doesn't bind values and that results
in segfault)
fix protos
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.192&r2=1.1760.2.193&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.192 php-src/NEWS:1.1760.2.193
--- php-src/NEWS:1.1760.2.192 Tue Jan 18 06:23:42 2005
+++ php-src/NEWS Tue Jan 18 10:07:10 2005
@@ -33,6 +33,8 @@
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia)
- Fixed bug #30446 (apache2handler: virtual() includes files out of sequence)
+- Fixed bug #30430 (odbc_next_result() doesn't bind values and that results
+ in segfault). (pdan-php at esync dot org, Tony)
- Fixed bug #30120 (imagettftext() and imagettfbbox() accept too many
parameters). (Jani)
- Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.179.2.2&r2=1.179.2.3&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.179.2.2
php-src/ext/odbc/php_odbc.c:1.179.2.3
--- php-src/ext/odbc/php_odbc.c:1.179.2.2 Mon Jan 17 13:11:36 2005
+++ php-src/ext/odbc/php_odbc.c Tue Jan 18 10:07:10 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.179.2.2 2005/01/17 18:11:36 tony2001 Exp $ */
+/* $Id: php_odbc.c,v 1.179.2.3 2005/01/18 15:07:10 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2423,10 +2423,7 @@
result->fetched = 0;
rc = SQLMoreResults(result->stmt);
- if (rc == SQL_SUCCESS) {
- RETURN_TRUE;
- }
- else if (rc == SQL_SUCCESS_WITH_INFO) {
+ if (rc == SQL_SUCCESS_WITH_INFO || rc == SQL_SUCCESS) {
rc = SQLFreeStmt(result->stmt, SQL_UNBIND);
SQLNumParams(result->stmt, &(result->numparams));
SQLNumResultCols(result->stmt, &(result->numcols));
@@ -2767,7 +2764,7 @@
* metadata functions
*/
-/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier,
string owner, string name, string table_types])
+/* {{{ proto resource odbc_tables(resource connection_id [, string qualifier
[, string owner [, string name [, string table_types]]]])
Call the SQLTables function */
PHP_FUNCTION(odbc_tables)
{
@@ -2846,7 +2843,7 @@
}
/* }}} */
-/* {{{ proto resource odbc_columns(resource connection_id, string qualifier,
string owner, string table_name, string column_name)
+/* {{{ proto resource odbc_columns(resource connection_id [, string qualifier
[, string owner [, string table_name [, string column_name]]]])
Returns a result identifier that can be used to fetch a list of column
names in specified tables */
PHP_FUNCTION(odbc_columns)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
