tony2001 Wed Jul 26 06:59:41 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/oci8 oci8.c
Log:
improve connection timeout check (implements FR #38210)
http://cvs.php.net/viewvc.cgi/php-src/ext/oci8/oci8.c?r1=1.269.2.16.2.8&r2=1.269.2.16.2.9&diff_format=u
Index: php-src/ext/oci8/oci8.c
diff -u php-src/ext/oci8/oci8.c:1.269.2.16.2.8
php-src/ext/oci8/oci8.c:1.269.2.16.2.9
--- php-src/ext/oci8/oci8.c:1.269.2.16.2.8 Wed Jun 28 15:03:33 2006
+++ php-src/ext/oci8/oci8.c Wed Jul 26 06:59:40 2006
@@ -26,7 +26,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: oci8.c,v 1.269.2.16.2.8 2006/06/28 15:03:33 tony2001 Exp $ */
+/* $Id: oci8.c,v 1.269.2.16.2.9 2006/07/26 06:59:40 tony2001 Exp $ */
/* TODO
*
* file://localhost/www/docs/oci10/ociaahan.htm#423823 - implement lob_empty()
with OCI_ATTR_LOBEMPTY
@@ -652,7 +652,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "OCI8 Support", "enabled");
php_info_print_table_row(2, "Version", "1.2.1");
- php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.8 $");
+ php_info_print_table_row(2, "Revision", "$Revision: 1.269.2.16.2.9 $");
sprintf(buf, "%ld", OCI_G(num_persistent));
php_info_print_table_row(2, "Active Persistent Connections", buf);
@@ -1056,7 +1056,7 @@
* 1) next_ping > 0, which
means that ping_interval is not -1 (aka "Off")
* 2) current_timestamp >
next_ping, which means "it's time to check if it's still alive"
* */
- if ( (connection->next_ping >
0) && (timestamp > connection->next_ping) &&
!php_oci_connection_ping(connection TSRMLS_CC)) {
+ if ( (connection->next_ping >
0) && (timestamp >= connection->next_ping) &&
!php_oci_connection_ping(connection TSRMLS_CC)) {
/* server died */
}
else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
