svn commit: r232335 - in /httpd/httpd/trunk/modules/cache: cache_storage.c mod_cache.c

[je...@apache.org]

Author: jerenkrantz
Date: Fri Aug 12 09:57:13 2005
New Revision: 232335

URL: http://svn.apache.org/viewcvs?rev=232335&view=rev
Log:
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

Modified:
    httpd/httpd/trunk/modules/cache/cache_storage.c
    httpd/httpd/trunk/modules/cache/mod_cache.c

Modified: httpd/httpd/trunk/modules/cache/cache_storage.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/cache_storage.c?rev=232335&r1=232334&r2=232335&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/cache_storage.c (original)
+++ httpd/httpd/trunk/modules/cache/cache_storage.c Fri Aug 12 09:57:13 2005
@@ -43,6 +43,8 @@
     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) {

Modified: httpd/httpd/trunk/modules/cache/mod_cache.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/cache/mod_cache.c?rev=232335&r1=232334&r2=232335&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_cache.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_cache.c Fri Aug 12 09:57:13 2005
@@ -803,12 +803,9 @@
         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);