cvs: php-src(PHP_5_1) /ext/mssql php_mssql.c

fmk Tue Apr 4 18:49:12 2006 UTC Modified files: (Branch: PHP_5_1) /php-src/ext/mssql php_mssql.c Log: Fix #33694 invalid sql or timeouts makes it impossible to reuse persistent connections http://cvs.php.net/viewcvs.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.12&r2=1.152.2.13&diff_format=u Index: php-src/ext/mssql/php_mssql.c diff -u php-src/ext/mssql/php_mssql.c:1.152.2.12 php-src/ext/mssql/php_mssql.c:1.152.2.13 --- php-src/ext/mssql/php_mssql.c:1.152.2.12 Sun Jan 1 12:50:09 2006 +++ php-src/ext/mssql/php_mssql.c Tue Apr 4 18:49:12 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_mssql.c,v 1.152.2.12 2006/01/01 12:50:09 sniper Exp $ */ +/* $Id: php_mssql.c,v 1.152.2.13 2006/04/04 18:49:12 fmk Exp $ */ #ifdef COMPILE_DL_MSSQL #define HAVE_MSSQL 1 @@ -229,6 +229,7 @@ mssql_result *result = (mssql_result *)rsrc->ptr; _free_result(result, 1); + dbcancel(result->mssql_ptr->link); efree(result); } @@ -1233,6 +1234,7 @@ } if (dbsqlexec(mssql_ptr->link)==FAIL || (retvalue = dbresults(mssql_ptr->link))==FAIL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Query failed"); + dbcancel(mssql_ptr->link); RETURN_FALSE; } @@ -1247,6 +1249,7 @@ retvalue=dbnextrow(mssql_ptr->link); if (retvalue==FAIL) { + dbcancel(mssql_ptr->link); RETURN_FALSE; } @@ -2172,6 +2175,7 @@ if (dbrpcexec(mssql_ptr->link)==FAIL || dbsqlok(mssql_ptr->link)==FAIL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure execution failed"); + dbcancel(mssql_ptr->link); RETURN_FALSE; } @@ -2179,6 +2183,7 @@ if (retval_results==FAIL) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not retrieve results"); + dbcancel(mssql_ptr->link); RETURN_FALSE; }