You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2008/07/25 02:49:04 UTC
svn commit: r679638 - /apr/apr-util/branches/1.3.x/memcache/apr_memcache.c
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 <bryantscott gmail.com>
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));