Author: markt
Date: Wed May 23 20:14:52 2012
New Revision: 1342014
URL: http://svn.apache.org/viewvc?rev=1342014&view=rev
Log:
Follow up to r1342004 and r1342010. Missed a couple of changes.
Back port of r1342013
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/poll.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
Merged /tomcat/native/trunk:r1342013
Modified: tomcat/native/branches/1.1.x/native/src/poll.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/poll.c?rev=1342014&r1=1342013&r2=1342014&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/poll.c (original)
+++ tomcat/native/branches/1.1.x/native/src/poll.c Wed May 23 20:14:52 2012
@@ -99,7 +99,7 @@ void sp_poll_dump_statistics()
TCN_IMPLEMENT_CALL(jlong, Poll, create)(TCN_STDARGS, jint size,
jlong pool, jint flags,
- jlong ttl)
+ jlong default_timeout)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
apr_pollset_t *pollset = NULL;
@@ -128,12 +128,12 @@ TCN_IMPLEMENT_CALL(jlong, Poll, create)(
TCN_CHECK_ALLOCATED(tps->set);
tps->socket_set = apr_palloc(p, size * sizeof(apr_pollfd_t));
TCN_CHECK_ALLOCATED(tps->socket_set);
- tps->socket_last_active = apr_palloc(p, size *
sizeof(apr_interval_time_t));
+ tps->socket_last_active = apr_palloc(p, size * sizeof(apr_time_t));
TCN_CHECK_ALLOCATED(tps->socket_last_active);
tps->nelts = 0;
tps->nalloc = size;
tps->pool = p;
- tps->default_timeout = J2T(ttl);
+ tps->default_timeout = J2T(default_timeout);
#ifdef TCN_DO_STATISTICS
sp_created++;
apr_pool_cleanup_register(p, (const void *)tps,
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
