From commits-return-12683-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Wed Sep 26 13:42:04 2012 Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0A2F1D37F for ; Wed, 26 Sep 2012 13:42:04 +0000 (UTC) Received: (qmail 83342 invoked by uid 500); 26 Sep 2012 13:42:03 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 83221 invoked by uid 500); 26 Sep 2012 13:42:03 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 83212 invoked by uid 99); 26 Sep 2012 13:42:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2012 13:42:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2012 13:42:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6EBDD23888EA for ; Wed, 26 Sep 2012 13:41:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1390482 - in /apr/apr-util/branches/1.5.x: ./ CHANGES memcache/apr_memcache.c Date: Wed, 26 Sep 2012 13:41:18 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120926134118.6EBDD23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Wed Sep 26 13:41:17 2012 New Revision: 1390482 URL: http://svn.apache.org/viewvc?rev=1390482&view=rev Log: merge r1390477 from trunk: Fix dead server retry logic. Submitted by: Gavin Shelley 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:r1390477 Modified: apr/apr-util/branches/1.5.x/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1390482&r1=1390481&r2=1390482&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 13:41:17 2012 @@ -1,6 +1,7 @@ -*- coding: utf-8 -*- Changes with APR-util 1.5.2 + *) memcache: Fix dead server retry logic. [Gavin Shelley ] 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=1390482&r1=1390481&r2=1390482&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 13:41:17 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);