Commit: 6ece5503942a1d8c4a78504161f9466e9e14fed2 Author: Christopher Jones <s...@php.net> Tue, 3 Sep 2013 15:17:36 -0700 Parents: 8a0ae67dd94fedbc4f47773919622d542505237c Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6ece5503942a1d8c4a78504161f9466e9e14fed2 Log: Cast time_t since some "dtrace -G" invocations fail on time_t arguments Changed paths: M ext/oci8/oci8.c M ext/oci8/oci8_dtrace.d M ext/oci8/package.xml Diff: diff --git a/ext/oci8/oci8.c b/ext/oci8/oci8.c index b183e48..2ff52b8 100644 --- a/ext/oci8/oci8.c +++ b/ext/oci8/oci8.c @@ -2783,7 +2783,7 @@ static int php_oci_persistent_helper(zend_rsrc_list_entry *le TSRMLS_DC) if (!connection->used_this_request && OCI_G(persistent_timeout) != -1) { #ifdef HAVE_OCI8_DTRACE if (DTRACE_OCI8_CONNECT_EXPIRY_ENABLED()) { - DTRACE_OCI8_CONNECT_EXPIRY(connection, connection->is_stub ? 1 : 0, connection->idle_expiry, timestamp); + DTRACE_OCI8_CONNECT_EXPIRY(connection, connection->is_stub ? 1 : 0, (long)connection->idle_expiry, (long)timestamp); } #endif /* HAVE_OCI8_DTRACE */ if (connection->idle_expiry < timestamp) { diff --git a/ext/oci8/oci8_dtrace.d b/ext/oci8/oci8_dtrace.d index 15d210c..d6982f0 100644 --- a/ext/oci8/oci8_dtrace.d +++ b/ext/oci8/oci8_dtrace.d @@ -27,7 +27,7 @@ provider php { probe oci8__connect__p__dtor__close(void *connection); probe oci8__connect__p__dtor__release(void *connection); probe oci8__connect__lookup(void *connection, int is_stub); - probe oci8__connect__expiry(void *connection, int is_stub, time_t idle_expiry, time_t timestamp); + probe oci8__connect__expiry(void *connection, int is_stub, long idle_expiry, long timestamp); probe oci8__connect__type(int persistent, int exclusive, void *connection, long num_persistent, long num_connections); probe oci8__sesspool__create(void *session_pool); probe oci8__sesspool__stats(unsigned long free, unsigned long busy, unsigned long open); diff --git a/ext/oci8/package.xml b/ext/oci8/package.xml index f18e7af..f2c59a1 100644 --- a/ext/oci8/package.xml +++ b/ext/oci8/package.xml @@ -40,7 +40,7 @@ http://pear.php.net/dtd/package-2.0.xsd";> <active>no</active> </lead> - <date>2013-08-30</date> + <date>2013-09-03</date> <time>12:00:00</time> <version> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
