sixd Mon Apr 7 21:55:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/oci8 oci8.c
Log:
Fix OCIPing 10.2 macro
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.38.2.13&r2=1.269.2.16.2.38.2.14&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.13
php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.14
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.38.2.13 Tue Apr 1 18:37:32 2008
+++ php-src/ext/oci8/oci8.c Mon Apr 7 21:55:43 2008
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.38.2.13 2008/04/01 18:37:32 sixd Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.38.2.14 2008/04/07 21:55:43 sixd Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -716,7 +716,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", PHP_OCI8_VERSION);
- php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.13 $");
+ php_info_print_table_row(2, "Revision", "$Revision:
1.269.2.16.2.38.2.14 $");
snprintf(buf, sizeof(buf), "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1438,7 +1438,7 @@
* successfully performed a roundtrip and validated the
* connection. Use OCIServerVersion for Pre-10.2 clients
*/
-#if ( (OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) &&
(OCI_MINOR_VERSION > 2)) ) /* OCIPing available 10.2 onwards */
+#if ( (OCI_MAJOR_VERSION > 10) || ((OCI_MAJOR_VERSION == 10) &&
(OCI_MINOR_VERSION >= 2)) ) /* OCIPing available 10.2 onwards */
PHP_OCI_CALL_RETURN(OCI_G(errcode), 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
