Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 91844 invoked from network); 25 Jul 2008 00:49:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Jul 2008 00:49:55 -0000 Received: (qmail 27932 invoked by uid 500); 25 Jul 2008 00:49:55 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 27887 invoked by uid 500); 25 Jul 2008 00:49:55 -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 27878 invoked by uid 99); 25 Jul 2008 00:49:54 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Jul 2008 17:49:54 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 25 Jul 2008 00:49:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B8CE9238898A; Thu, 24 Jul 2008 17:49:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r679638 - /apr/apr-util/branches/1.3.x/memcache/apr_memcache.c Date: Fri, 25 Jul 2008 00:49:04 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080725004904.B8CE9238898A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Thu Jul 24 17:49:04 2008 New Revision: 679638 URL: http://svn.apache.org/viewvc?rev=679638&view=rev Log: Backport r679637 from the trunk. Fix parsing of rusage in stats data. PR 44587. Patch by Bryant Scott Modified: apr/apr-util/branches/1.3.x/memcache/apr_memcache.c Modified: apr/apr-util/branches/1.3.x/memcache/apr_memcache.c URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/memcache/apr_memcache.c?rev=679638&r1=679637&r2=679638&view=diff ============================================================================== --- apr/apr-util/branches/1.3.x/memcache/apr_memcache.c (original) +++ apr/apr-util/branches/1.3.x/memcache/apr_memcache.c Thu Jul 24 17:49:04 2008 @@ -1517,15 +1517,11 @@ char *tok; char *secs; char *usecs; - const char *sep = ":"; + const char *sep = ":."; buf[len-2] = '\0'; secs = apr_strtok(buf, sep, &tok); - if (secs == NULL) { - sep = "."; - secs = apr_strtok(buf, sep, &tok); - } usecs = apr_strtok(NULL, sep, &tok); if (secs && usecs) { return apr_time_make(atoi(secs), atoi(usecs));