From commits-return-12696-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Thu Sep 27 20:08:00 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 8C9D69706 for ; Thu, 27 Sep 2012 20:08:00 +0000 (UTC) Received: (qmail 38257 invoked by uid 500); 27 Sep 2012 20:08:00 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 38182 invoked by uid 500); 27 Sep 2012 20:07:59 -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 38173 invoked by uid 99); 27 Sep 2012 20:07:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Sep 2012 20:07:59 +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; Thu, 27 Sep 2012 20:07:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A7B3A23889FD for ; Thu, 27 Sep 2012 20:07:15 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1391193 - /apr/apr/trunk/memcache/apr_memcache.c Date: Thu, 27 Sep 2012 20:07:15 -0000 To: commits@apr.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120927200715.A7B3A23889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Thu Sep 27 20:07:15 2012 New Revision: 1391193 URL: http://svn.apache.org/viewvc?rev=1391193&view=rev Log: Revert r1390526; ttl is in microseconds Modified: apr/apr/trunk/memcache/apr_memcache.c Modified: apr/apr/trunk/memcache/apr_memcache.c URL: http://svn.apache.org/viewvc/apr/apr/trunk/memcache/apr_memcache.c?rev=1391193&r1=1391192&r2=1391193&view=diff ============================================================================== --- apr/apr/trunk/memcache/apr_memcache.c (original) +++ apr/apr/trunk/memcache/apr_memcache.c Thu Sep 27 20:07:15 2012 @@ -414,7 +414,7 @@ APR_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);