tony2001 Tue Mar 7 07:47:43 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/oci8 oci8.c
Log:
MFH
add workaround for Oracle server crash, use OCIServerVersion() instead of
OCIPing()
fix #36250 (PHP Causes ORA-07445 Core dump in Oracle server 9.2.x)
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.445&r2=1.2027.2.446&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.445 php-src/NEWS:1.2027.2.446
--- php-src/NEWS:1.2027.2.445 Mon Mar 6 21:59:18 2006
+++ php-src/NEWS Tue Mar 7 07:47:43 2006
@@ -92,6 +92,8 @@
- Fixed bug #36283 (SOAPClient Compression Broken). (Dmitry)
- Fixed bug #36268 (Object destructors called even after fatal errors).
(Dmitry)
- Fixed bug #36258 (SplFileObject::getPath() may lead to segfault). (Tony)
+- Fixed bug #36250 (PHP causes ORA-07445 core dump in Oracle server 9.2.x).
+ (Tony)
- Fixed bug #36242 (Possible memory corruption in stream_select()). (Tony)
- Fixed bug #36235 (ocicolumnname returns false before a succesfull fetch).
(Tony)
http://cvs.php.net/viewcvs.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.10&r2=1.269.2.11&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.10 php-src/ext/oci8/oci8.c:1.269.2.11
--- php-src/ext/oci8/oci8.c:1.269.2.10 Wed Jan 18 10:12:34 2006
+++ php-src/ext/oci8/oci8.c Tue Mar 7 07:47:43 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.10 2006/01/18 10:12:34 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.11 2006/03/07 07:47:43 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.10 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.11 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -988,7 +988,7 @@
smart_str_appends_ex(&hashed_details, charset, 1);
}
else {
- size_t rsize;
+ size_t rsize = 0;
PHP_OCI_CALL(OCINlsEnvironmentVariableGet, (&charsetid, 2,
OCI_NLS_CHARSET_ID, 0, &rsize));
smart_str_append_unsigned_ex(&hashed_details, charsetid, 0);
@@ -1347,8 +1347,8 @@
* Ping connection. Uses OCIPing() or OCIServerVersion() depending on the
Oracle Client version */
static int php_oci_connection_ping(php_oci_connection *connection TSRMLS_DC)
{
-#if OCI_MAJOR_VERSION >= 10 && OCI_MINOR_VERSION >= 2
- /* OCIPing() is usable only in 10.2 */
+ /* OCIPing() crashes Oracle servers older than 10.2 */
+#if 0
OCI_G(errcode) = PHP_OCI_CALL(OCIPing, (connection->svc, OCI_G(err),
OCI_DEFAULT));
#else
char version[256];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
