You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by tr...@apache.org on 2012/09/27 22:11:28 UTC
svn commit: r1391196 - in /apr/apr-util/branches/1.4.x: ./ CHANGES
include/apr_buckets.h memcache/apr_memcache.c
Author: trawick
Date: Thu Sep 27 20:11:28 2012
New Revision: 1391196
URL: http://svn.apache.org/viewvc?rev=1391196&view=rev
Log:
Revert r1390530; ttl is in microseconds
Modified:
apr/apr-util/branches/1.4.x/ (props changed)
apr/apr-util/branches/1.4.x/CHANGES
apr/apr-util/branches/1.4.x/include/apr_buckets.h (props changed)
apr/apr-util/branches/1.4.x/memcache/apr_memcache.c
Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
Reverse-merged /apr/apr/trunk:r1390526
Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=1391196&r1=1391195&r2=1391196&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Thu Sep 27 20:11:28 2012
@@ -1,10 +1,6 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.4.3
- *) 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>]
*) Improve platform detection for bundled expat by updating
Propchange: apr/apr-util/branches/1.4.x/include/apr_buckets.h
------------------------------------------------------------------------------
Reverse-merged /apr/apr/trunk/include/apr_buckets.h:r1390526
Modified: apr/apr-util/branches/1.4.x/memcache/apr_memcache.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/memcache/apr_memcache.c?rev=1391196&r1=1391195&r2=1391196&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/memcache/apr_memcache.c (original)
+++ apr/apr-util/branches/1.4.x/memcache/apr_memcache.c Thu Sep 27 20:11:28 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);