apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1391194 - in /apr/apr-util/branches/1.5.x: ./ CHANGES memcache/apr_memcache.c
Date Thu, 27 Sep 2012 20:09:25 GMT
Author: trawick
Date: Thu Sep 27 20:09:25 2012
New Revision: 1391194

URL: http://svn.apache.org/viewvc?rev=1391194&view=rev
Log:
Revert r1390529; ttl is in microseconds

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/
------------------------------------------------------------------------------
  Reverse-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=1391194&r1=1391193&r2=1391194&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Thu Sep 27 20:09:25 2012
@@ -4,10 +4,6 @@ Changes with APR-util 1.5.2
   *) apr_crypto: If --with-crypto is passed to configure but no crypto
      libraries are enabled, autodetect available libraries.  [Jeff Trawick]
 
-  *) 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=1391194&r1=1391193&r2=1391194&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 Thu Sep 27 20:09:25 2012
@@ -414,7 +414,7 @@ APU_DECLARE(apr_status_t) apr_memcache_s
                                min,                     /* hard minimum */
                                smax,                    /* soft maximum */
                                max,                     /* hard maximum */
-                               apr_time_from_sec(ttl),  /* Time to live */
+                               ttl,                     /* Time to live */
                                mc_conn_construct,       /* Make a New Connection */
                                mc_conn_destruct,        /* Kill Old Connection */
                                server, np);



Mime
View raw message