Move the debuging log message about the removal of a url from

cache_remove_url_filter to cache_remove_url.

Submitted by: Rudiger Plum <ruediger.pluem vodafone.com>
Reviewed by: Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232335 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 689e9ef974d33b077bcc554c1d78a899e5c58ad8..74beb182c0a217336c064c4183b57d6a363025b4 100644 (file)
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -43,6 +43,8 @@ int cache_remove_url(cache_request_rec *cache, apr_pool_t *p)
     if (!h) {
        return OK;
     }
+    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
+                 "cache: Removing url %s from the cache", h->cache_obj->key);
 
     /* for each specified cache type, delete the URL */
     while(list) {

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 0157e0483a119255b9879f6e735c9974778867d8..ff0074c07d8c6172d9db76eefd963c10b268aa61 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -803,12 +803,9 @@ static int cache_remove_url_filter(ap_filter_t *f, apr_bucket_brigade *in)
         ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, in);
     }
-    /*
-     * Now remove this cache entry from the cache
-     */
-    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                 "cache: Removing url %s from the cache", f->r->unparsed_uri);
+    /* Now remove this cache entry from the cache */
     cache_remove_url(cache, r->pool);
+
     /* remove ourselves */
     ap_remove_output_filter(f);
     return ap_pass_brigade(f->next, in);