[PHP-CVS] cvs: php-src(PHP_4_4) /ext/mssql php_mssql.c

[Frank M. Kromann]

fmk             Tue Apr  4 18:50:16 2006 UTC

  Modified files:              (Branch: PHP_4_4)
    /php-src/ext/mssql  php_mssql.c 
  Log:
  MFP51: 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.86.2.44.2.10&r2=1.86.2.44.2.11&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.86.2.44.2.10 
php-src/ext/mssql/php_mssql.c:1.86.2.44.2.11
--- php-src/ext/mssql/php_mssql.c:1.86.2.44.2.10        Sun Jan  1 13:46:55 2006
+++ php-src/ext/mssql/php_mssql.c       Tue Apr  4 18:50:16 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_mssql.c,v 1.86.2.44.2.10 2006/01/01 13:46:55 sniper Exp $ */
+/* $Id: php_mssql.c,v 1.86.2.44.2.11 2006/04/04 18:50:16 fmk Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -222,6 +222,7 @@
        mssql_result *result = (mssql_result *)rsrc->ptr;
 
        _free_result(result, 1);
+       dbcancel(result->mssql_ptr->link);
        efree(result);
 }
 
@@ -1230,6 +1231,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;
        }
        
@@ -1244,6 +1246,7 @@
 
        retvalue=dbnextrow(mssql_ptr->link);    
        if (retvalue==FAIL) {
+               dbcancel(mssql_ptr->link);
                RETURN_FALSE;
        }
 
@@ -2182,6 +2185,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;
        }
 
@@ -2189,6 +2193,7 @@
 
        if (retval_results==FAIL) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "could not retrieve 
results");
+               dbcancel(mssql_ptr->link);
                RETURN_FALSE;
        }
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php