sixd            Tue Mar 25 17:38:07 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/oci8   oci8_statement.c 
  Log:
  revert stmt release on connection error change (and sync with PHP 6)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_statement.c?r1=1.7.2.14.2.28.2.6&r2=1.7.2.14.2.28.2.7&diff_format=u
Index: php-src/ext/oci8/oci8_statement.c
diff -u php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.6 
php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.7
--- php-src/ext/oci8/oci8_statement.c:1.7.2.14.2.28.2.6 Sat Mar 22 01:27:50 2008
+++ php-src/ext/oci8/oci8_statement.c   Tue Mar 25 17:38:07 2008
@@ -25,7 +25,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.6 2008/03/22 01:27:50 sixd Exp $ */
+/* $Id: oci8_statement.c,v 1.7.2.14.2.28.2.7 2008/03/25 17:38:07 sixd Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -82,7 +82,7 @@
                        connection->errcode = php_oci_error(connection->err, 
connection->errcode TSRMLS_CC);
 
 #if HAVE_OCI_STMT_PREPARE2
-                       PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, 
statement->err, NULL, 0, OCI_STRLS_CACHE_DELETE));
+                       PHP_OCI_CALL(OCIStmtRelease, (statement->stmt, 
statement->err, NULL, 0, statement->errcode ? OCI_STRLS_CACHE_DELETE : 
OCI_DEFAULT));
                        PHP_OCI_CALL(OCIHandleFree,(statement->err, 
OCI_HTYPE_ERROR));
 #else
                        PHP_OCI_CALL(OCIHandleFree,(statement->stmt, 
OCI_HTYPE_STMT));



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

Reply via email to