tony2001 Tue Jan 18 10:03:53 2005 EDT Modified files: /php-src/ext/odbc php_odbc.c Log: 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/ext/odbc/php_odbc.c?r1=1.184&r2=1.185&ty=u Index: php-src/ext/odbc/php_odbc.c diff -u php-src/ext/odbc/php_odbc.c:1.184 php-src/ext/odbc/php_odbc.c:1.185 --- php-src/ext/odbc/php_odbc.c:1.184 Mon Jan 17 13:08:54 2005 +++ php-src/ext/odbc/php_odbc.c Tue Jan 18 10:03:51 2005 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_odbc.c,v 1.184 2005/01/17 18:08:54 tony2001 Exp $ */ +/* $Id: php_odbc.c,v 1.185 2005/01/18 15:03:51 tony2001 Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -2465,10 +2465,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)); @@ -2809,7 +2806,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) { @@ -2888,7 +2885,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