apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1390529 - in /apr/apr-util/branches/1.5.x: ./ CHANGES memcache/apr_memcache.c
Date Wed, 26 Sep 2012 14:46:38 GMT
Author: trawick
Date: Wed Sep 26 14:46:38 2012
New Revision: 1390529

URL: http://svn.apache.org/viewvc?rev=1390529&view=rev
Log:
merge r1390526 from trunk:

apr_memcache_server_create(): Fix handling of the ttl parameter.
It is documented as a number of seconds but was treated as 
microseconds.

(The current Subversion release passes seconds.)

PR: 51511
Submitted by: Tim Whittington <timw apache.org>
Reviewed by: trawick

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/memcache/apr_memcache.c

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1390526

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1390529&r1=1390528&r2=1390529&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Wed Sep 26 14:46:38 2012
@@ -1,6 +1,10 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.2
 
+  *) apr_memcache_server_create(): Fix handling of the ttl parameter.
+     It is documented as a number of seconds but was treated as 
+     microseconds.  PR: 51511.  [Tim Whittington <timw apache.org>]
+
   *) memcache: Fix dead server retry logic.  [Gavin Shelley <columbusmonkey me.com>]
 
 Changes with APR-util 1.5.1

Modified: apr/apr-util/branches/1.5.x/memcache/apr_memcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/memcache/apr_memcache.c?rev=1390529&r1=1390528&r2=1390529&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/memcache/apr_memcache.c (original)
+++ apr/apr-util/branches/1.5.x/memcache/apr_memcache.c Wed Sep 26 14:46:38 2012
@@ -414,7 +414,7 @@ APU_DECLARE(apr_status_t) apr_memcache_s
                                min,                     /* hard minimum */
                                smax,                    /* soft maximum */
                                max,                     /* hard maximum */
-                               ttl,                     /* Time to live */
+                               apr_time_from_sec(ttl),  /* Time to live */
                                mc_conn_construct,       /* Make a New Connection */
                                mc_conn_destruct,        /* Kill Old Connection */
                                server, np);



Mime
View raw message