Return-Path: 
 <commits-return-12688-apmail-apr-commits-archive=apr.apache.org@apr.apache.org>
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 E6439976E
	for <apmail-apr-commits-archive@www.apache.org>;
 Wed, 26 Sep 2012 14:43:39 +0000 (UTC)
Received: (qmail 20388 invoked by uid 500); 26 Sep 2012 14:43:39 -0000
Delivered-To: apmail-apr-commits-archive@apr.apache.org
Received: (qmail 20342 invoked by uid 500); 26 Sep 2012 14:43:39 -0000
Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:commits@apr.apache.org>
List-Help: <mailto:commits-help@apr.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
List-Id: <commits.apr.apache.org>
Delivered-To: mailing list commits@apr.apache.org
Received: (qmail 20335 invoked by uid 99); 26 Sep 2012 14:43:39 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Sep 2012 14:43:39 +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 14:43:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id B34B023888E3
	for <commits@apr.apache.org>; Wed, 26 Sep 2012 14:42:53 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1390526 - /apr/apr/trunk/memcache/apr_memcache.c
Date: Wed, 26 Sep 2012 14:42:53 -0000
To: commits@apr.apache.org
From: trawick@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120926144253.B34B023888E3@eris.apache.org>

Author: trawick
Date: Wed Sep 26 14:42:53 2012
New Revision: 1390526

URL: http://svn.apache.org/viewvc?rev=1390526&view=rev
Log:
apr_memcache_server_create(): Fix handling of the ttl parameter.
It is documented as a number of seconds but was treated as 
microseconds.

(The current Subversion release passes seconds.)

Submitted by: Tim Whittington <timw apache.org>
Reviewed by: trawick

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=1390526&r1=1390525&r2=1390526&view=diff
==============================================================================
--- apr/apr/trunk/memcache/apr_memcache.c (original)
+++ apr/apr/trunk/memcache/apr_memcache.c Wed Sep 26 14:42:53 2012
@@ -414,7 +414,7 @@ APR_DECLARE(apr_status_t) apr_memcache_s
                                min,                     /* hard minimum */
                                smax,                    /* soft maximum */
                                max,                     /* hard maximum */
-                               ttl,                     /* Time to live */
+                               apr_time_from_sec(ttl),  /* Time to live */
                                mc_conn_construct,       /* Make a New Connection */
                                mc_conn_destruct,        /* Kill Old Connection */
                                server, np);