Remove the remove_url filter consistently for both the ap_die() and the

mod_proxy cases.

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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 2fddca88c081192825a8e9509c6704d5ba9440cf..bc95a21a5683656fe05fb92b00c162f465dc3f7c 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1595,6 +1595,8 @@ static void cache_insert_error_filter(request_rec *r)
     if (dummy) {
         cache_request_rec *cache = (cache_request_rec *) dummy;
 
+        ap_remove_output_filter(cache->remove_url_filter);
+
         if (cache->stale_handle && cache->save_filter
                 && !cache->stale_handle->cache_obj->info.control.must_revalidate
                 && !cache->stale_handle->cache_obj->info.control.proxy_revalidate) {
@@ -1627,8 +1629,6 @@ static void cache_insert_error_filter(request_rec *r)
                         "110 Response is stale");
             }
 
-            ap_remove_output_filter(cache->remove_url_filter);
-
             cache_run_cache_status(
                     cache->handle,
                     r,