httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r917177 - /httpd/httpd/branches/2.2.x/modules/cache/cache_util.c
Date Sun, 28 Feb 2010 13:25:53 GMT
Author: minfrin
Date: Sun Feb 28 13:25:53 2010
New Revision: 917177

URL: http://svn.apache.org/viewvc?rev=917177&view=rev
Log:
Backport r808723, which was applied to trunk but not added to the backport
proposal below. Fixes a compiler warning on v2.2 reported by Rainer Jung.
mod_cache: Introduce the thundering herd lock, a mechanism to keep
the flood of requests at bay that strike a backend webserver as
a cached entity goes stale.

Modified:
    httpd/httpd/branches/2.2.x/modules/cache/cache_util.c

Modified: httpd/httpd/branches/2.2.x/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/cache_util.c?rev=917177&r1=917176&r2=917177&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/cache_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/cache_util.c Sun Feb 28 13:25:53 2010
@@ -249,8 +249,8 @@
                      lockname);
         return status;
     }
-    if (APR_SUCCESS == status && ((now - finfo.mtime) > conf->lockmaxage)
-            || (now < finfo.mtime)) {
+    if ((status == APR_SUCCESS) && (((now - finfo.mtime) > conf->lockmaxage)
+                                  || (now < finfo.mtime))) {
         ap_log_error(APLOG_MARK, APLOG_INFO, status, r->server,
                      "Cache lock file for '%s' too old, removing: %s",
                      r->uri, lockname);



Mime
View raw message