diff options
author | Eric Covener <covener@apache.org> | 2014-04-19 22:21:01 +0200 |
---|---|---|
committer | Eric Covener <covener@apache.org> | 2014-04-19 22:21:01 +0200 |
commit | e31a8d28cb8f2a2ba5713575d88ff9b34bc878d5 (patch) | |
tree | 867dc0562de23c43c9a4526f5b7948e2b03615bf /modules/cache | |
parent | strncmp(r->filename, "proxy:", 6) is faster than a (diff) | |
download | apache2-e31a8d28cb8f2a2ba5713575d88ff9b34bc878d5.tar.xz apache2-e31a8d28cb8f2a2ba5713575d88ff9b34bc878d5.zip |
Fix errors with CacheLock on Windows:
cache_util.c(757): (OS 80)The file exists. : [client 127.0.0.1:63889]
AH00784: Attempt to obtain a cache lock for stale cached URL failed,
revalidating entry anyway:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588704 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
-rw-r--r-- | modules/cache/cache_util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c index 7b7fb45c23..cafbc16781 100644 --- a/modules/cache/cache_util.c +++ b/modules/cache/cache_util.c @@ -240,7 +240,7 @@ CACHE_DECLARE(apr_int64_t) ap_cache_current_age(cache_info *info, * Try obtain a cache wide lock on the given cache key. * * If we return APR_SUCCESS, we obtained the lock, and we are clear to - * proceed to the backend. If we return APR_EEXISTS, then the lock is + * proceed to the backend. If we return APR_EEXIST, then the lock is * already locked, someone else has gone to refresh the backend data * already, so we must return stale data with a warning in the mean * time. If we return anything else, then something has gone pear @@ -735,9 +735,9 @@ int cache_check_freshness(cache_handle_t *h, cache_request_rec *cache, r->unparsed_uri); return 0; } - else if (APR_EEXIST == status) { + else if (APR_STATUS_IS_EEXIST(status)) { /* lock already exists, return stale data anyway, with a warning */ - ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(00783) + ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r, APLOGNO(00783) "Cache already locked for stale cached URL, " "pretend it is fresh: %s", r->unparsed_uri); |