tony2001 Tue Jul 31 21:09:01 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8_interface.c
Log:
MFH: missing part of the fix for bug #42134
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8_interface.c?r1=1.8.2.7.2.11&r2=1.8.2.7.2.12&diff_format=u
Index: php-src/ext/oci8/oci8_interface.c
diff -u php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.11
php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.12
--- php-src/ext/oci8/oci8_interface.c:1.8.2.7.2.11 Tue Jul 31 19:21:08 2007
+++ php-src/ext/oci8/oci8_interface.c Tue Jul 31 21:09:01 2007
@@ -25,7 +25,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8_interface.c,v 1.8.2.7.2.11 2007/07/31 19:21:08 tony2001 Exp $ */
+/* $Id: oci8_interface.c,v 1.8.2.7.2.12 2007/07/31 21:09:01 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1583,19 +1583,28 @@
RETURN_FALSE;
}
#endif
- } else {
- connection = (php_oci_connection *)
zend_fetch_resource(&arg TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
-
- if (connection) {
- errh = connection->err;
- error = connection->errcode;
- }
+ goto go_out;
+ }
+
+ connection = (php_oci_connection *) zend_fetch_resource(&arg
TSRMLS_CC, -1, NULL, NULL, 1, le_connection);
+ if (connection) {
+ errh = connection->err;
+ error = connection->errcode;
+ goto go_out;
+ }
+
+ connection = (php_oci_connection *) zend_fetch_resource(&arg
TSRMLS_CC, -1, NULL, NULL, 1, le_pconnection);
+ if (connection) {
+ errh = connection->err;
+ error = connection->errcode;
+ goto go_out;
}
} else {
errh = OCI_G(err);
error = OCI_G(errcode);
}
+go_out:
if (error == OCI_SUCCESS) { /* no error set in the handle */
RETURN_FALSE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
