apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r794516 - in /apr/apr-util/branches/1.4.x: ./ buckets/apr_brigade.c include/apr_memcache.h include/apr_reslist.h misc/apr_queue.c
Date Thu, 16 Jul 2009 04:07:44 GMT
Author: bojan
Date: Thu Jul 16 04:07:44 2009
New Revision: 794516

URL: http://svn.apache.org/viewvc?rev=794516&view=rev
Log:
Backport r794508 from the trunk.
Document how ttl is specified for reslist and memcache.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/buckets/apr_brigade.c   (props changed)
    apr/apr-util/branches/1.4.x/include/apr_memcache.h
    apr/apr-util/branches/1.4.x/include/apr_reslist.h
    apr/apr-util/branches/1.4.x/misc/apr_queue.c   (props changed)

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 04:07:44 2009
@@ -1,2 +1,2 @@
-/apr/apr/trunk:781403,781409,784519,784592,789965
+/apr/apr/trunk:781403,781409,784519,784592,789965,794508
 /apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Propchange: apr/apr-util/branches/1.4.x/buckets/apr_brigade.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 04:07:44 2009
@@ -1,2 +1,2 @@
-/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965
+/apr/apr/trunk/buckets/apr_brigade.c:768417,781403,781409,784519,784592,789965,794508
 /apr/apr-util/trunk/buckets/apr_brigade.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630

Modified: apr/apr-util/branches/1.4.x/include/apr_memcache.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/include/apr_memcache.h?rev=794516&r1=794515&r2=794516&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/include/apr_memcache.h (original)
+++ apr/apr-util/branches/1.4.x/include/apr_memcache.h Thu Jul 16 04:07:44 2009
@@ -209,7 +209,7 @@
  * @param min  minimum number of client sockets to open
  * @param smax soft maximum number of client connections to open
  * @param max  hard maximum number of client connections
- * @param ttl  time to live in seconds of a client connection
+ * @param ttl  time to live in microseconds of a client connection
  * @param ns   location of the new server object
  * @see apr_reslist_create
  * @remark min, smax, and max are only used when APR_HAS_THREADS

Modified: apr/apr-util/branches/1.4.x/include/apr_reslist.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/include/apr_reslist.h?rev=794516&r1=794515&r2=794516&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/include/apr_reslist.h (original)
+++ apr/apr-util/branches/1.4.x/include/apr_reslist.h Thu Jul 16 04:07:44 2009
@@ -72,8 +72,8 @@
  * @param smax Resources will be destroyed to meet this maximum
  *             restriction as they expire.
  * @param hmax Absolute maximum limit on the number of total resources.
- * @param ttl If non-zero, sets the maximum amount of time a resource
- *               may be available while exceeding the soft limit.
+ * @param ttl If non-zero, sets the maximum amount of time in microseconds a
+ *            resource may be available while exceeding the soft limit.
  * @param con Constructor routine that is called to create a new resource.
  * @param de Destructor routine that is called to destroy an expired resource.
  * @param params Passed to constructor and deconstructor

Propchange: apr/apr-util/branches/1.4.x/misc/apr_queue.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 16 04:07:44 2009
@@ -1,3 +1,3 @@
-/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965
+/apr/apr/trunk/misc/apr_queue.c:781403,781409,784519,784592,789965,794508
 /apr/apr/trunk/util-misc/apr_queue.c:784520
 /apr/apr-util/trunk/misc/apr_queue.c:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630



Mime
View raw message