tony2001 Thu Jan 20 13:42:41 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/oci8 oci8.c
Log:
MFH: fix bug #31623 (OCILogin does not support password grace period)
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.201&r2=1.1760.2.202&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.201 php-src/NEWS:1.1760.2.202
--- php-src/NEWS:1.1760.2.201 Thu Jan 20 12:57:05 2005
+++ php-src/NEWS Thu Jan 20 13:42:40 2005
@@ -6,6 +6,8 @@
- Changed phpize not to require automake and libtool. (Jani)
- Fixed build system to always use bundled libtool files. (Jani)
- Fixed a bug in mysqli_stmt_execute() (type conversion with NULL values).
(Georg)
+- Fixed bug #31623 (OCILogin does not support password grace period).
+ (daniel dot beet at accuratesoftware dot com, Tony)
- Fixed bug #31480 (Possible infinite loop in imap_mail_compose()). (Ilia)
- Fixed bug #31479 (Fixed crash in chunk_split(), when chunklen > strlen).
(Ilia)
- Fixed bug #31454 (session_set_save_handler crashes PHP when supplied
http://cvs.php.net/diff.php/php-src/ext/oci8/oci8.c?r1=1.257.2.5&r2=1.257.2.6&ty=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.257.2.5 php-src/ext/oci8/oci8.c:1.257.2.6
--- php-src/ext/oci8/oci8.c:1.257.2.5 Mon Nov 22 16:46:49 2004
+++ php-src/ext/oci8/oci8.c Thu Jan 20 13:42:40 2005
@@ -22,7 +22,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.257.2.5 2004/11/22 21:46:49 andi Exp $ */
+/* $Id: oci8.c,v 1.257.2.6 2005/01/20 18:42:40 tony2001 Exp $ */
/* TODO list:
*
@@ -786,7 +786,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
- php_info_print_table_row(2, "Revision", "$Revision: 1.257.2.5 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.257.2.6 $");
sprintf(buf, "%ld", num_persistent);
php_info_print_table_row(2, "Active Persistent Links", buf);
@@ -2863,7 +2863,12 @@
if (OCI(error) != OCI_SUCCESS) {
oci_error(OCI(pError), "OCISessionBegin", OCI(error));
- goto CLEANUP;
+ /* OCISessionBegin returns OCI_SUCCESS_WITH_INFO when
+ * user's password has expired, but is still usable.
+ * */
+ if (OCI(error) != OCI_SUCCESS_WITH_INFO) {
+ goto CLEANUP;
+ }
}
/* Free Temporary Service Context */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
