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/26 15:42:39 UTC
svn commit: r1390483 - in /apr/apr-util/branches/1.4.x: ./ CHANGES
include/apr_buckets.h memcache/apr_memcache.c
Author: trawick
Date: Wed Sep 26 13:42:38 2012
New Revision: 1390483
URL: http://svn.apache.org/viewvc?rev=1390483&view=rev
Log:
merge r1390477 from trunk:
Fix dead server retry logic.
Submitted by: Gavin Shelley <columbusmonkey me.com>
Reviewed by: trawick
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/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1390477
Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=1390483&r1=1390482&r2=1390483&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Wed Sep 26 13:42:38 2012
@@ -1,6 +1,8 @@
-*- coding: utf-8 -*-
Changes with APR-util 1.4.3
+ *) memcache: Fix dead server retry logic. [Gavin Shelley <columbusmonkey me.com>]
+
*) Improve platform detection for bundled expat by updating
config.guess and config.sub. [Rainer Jung]
Propchange: apr/apr-util/branches/1.4.x/include/apr_buckets.h
------------------------------------------------------------------------------
Merged /apr/apr/trunk/include/apr_buckets.h:r1390477
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=1390483&r1=1390482&r2=1390483&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 Wed Sep 26 13:42:38 2012
@@ -183,8 +183,8 @@ apr_memcache_find_server_hash_default(vo
#endif
/* Try the the dead server, every 5 seconds */
if (curtime - ms->btime > apr_time_from_sec(5)) {
+ ms->btime = curtime;
if (mc_version_ping(ms) == APR_SUCCESS) {
- ms->btime = curtime;
make_server_live(mc, ms);
#if APR_HAS_THREADS
apr_thread_mutex_unlock(ms->lock);