tony2001 Wed Mar 22 09:45:39 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/oci8 oci8.c
/php-src NEWS
Log:
fix #36820 (Privileged connection with an Oracle password file fails)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.11&r2=1.269.2.12&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.11 php-src/ext/oci8/oci8.c:1.269.2.12
--- php-src/ext/oci8/oci8.c:1.269.2.11 Tue Mar 7 07:47:43 2006
+++ php-src/ext/oci8/oci8.c Wed Mar 22 09:45:39 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.11 2006/03/07 07:47:43 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.12 2006/03/22 09:45:39 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -645,7 +645,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.11 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.12 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1286,7 +1286,11 @@
case OCI_SYSDBA:
case OCI_SYSOPER:
default:
- OCI_G(errcode) = PHP_OCI_CALL(OCISessionBegin,
(connection->svc, OCI_G(err), connection->session, (ub4) OCI_CRED_EXT, (ub4)
session_mode));
+ if (username_len == 1 && username[0] == '/' &&
password_len == 0) {
+ OCI_G(errcode) =
PHP_OCI_CALL(OCISessionBegin, (connection->svc, OCI_G(err),
connection->session, (ub4) OCI_CRED_EXT, (ub4) session_mode));
+ } else {
+ OCI_G(errcode) =
PHP_OCI_CALL(OCISessionBegin, (connection->svc, OCI_G(err),
connection->session, (ub4) OCI_CRED_RDBMS, (ub4) session_mode));
+ }
break;
}
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.476&r2=1.2027.2.477&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.476 php-src/NEWS:1.2027.2.477
--- php-src/NEWS:1.2027.2.476 Tue Mar 21 15:35:28 2006
+++ php-src/NEWS Wed Mar 22 09:45:39 2006
@@ -10,6 +10,8 @@
(also fixes bug #36764). (Tony)
- Removed the E_STRICT deprecation notice from "var". (Ilia)
- Fixed debug_zval_dump() to support private and protected members. (Dmitry)
+- Fixed bug #36820 (Privileged connection with an Oracle password file fails).
+ (Tony)
- Fixed bug #36809 (__FILE__ behavior changed). (Dmitry)
- Fixed bug #36808 (syslog ident becomes garbage between requests). (Tony)
- Fixed bug #36802 (mysqli_set_charset() crash with a non-open connection).
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
