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

[Kalle Sommer Nielsen]

kalle           Mon Feb 23 21:21:02 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/mssql  php_mssql.c 
  Log:
  Fixed #37209 (mssql_execute with non fatal errors)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4.2.21&r2=1.152.2.13.2.4.2.22&diff_format=u
Index: php-src/ext/mssql/php_mssql.c
diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.21 
php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.22
--- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4.2.21   Tue Jan 20 20:03:04 2009
+++ php-src/ext/mssql/php_mssql.c       Mon Feb 23 21:21:02 2009
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.21 2009/01/20 20:03:04 felipe Exp $ */
+/* $Id: php_mssql.c,v 1.152.2.13.2.4.2.22 2009/02/23 21:21:02 kalle Exp $ */
 
 #ifdef COMPILE_DL_MSSQL
 #define HAVE_MSSQL 1
@@ -2101,6 +2101,7 @@
        mssql_result *result;
        int num_fields;
        int batchsize;
+       int exec_retval;
 
        batchsize = MS_SQL_G(batchsize);
 
@@ -2111,10 +2112,15 @@
        ZEND_FETCH_RESOURCE(statement, mssql_statement *, &stmt, -1, "MS 
SQL-Statement", le_statement);
 
        mssql_ptr=statement->link;
+       exec_retval = dbrpcexec(mssql_ptr->link);
 
-       if (dbrpcexec(mssql_ptr->link)==FAIL || dbsqlok(mssql_ptr->link)==FAIL) 
{
+       if (exec_retval == FAIL || dbsqlok(mssql_ptr->link) == FAIL) {
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "stored procedure 
execution failed");
-               dbcancel(mssql_ptr->link);
+
+               if (exec_retval == FAIL) {
+                       dbcancel(mssql_ptr->link);
+               }
+
                RETURN_FALSE;
        }
 



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