Remove the CACHE_IN filter is we are not doing caching

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

diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index 8bd2986c3b2df56d5f760d356556bb2c33f9be35..263f83650c65184e42aeba97212e8d47da58a95c 100644 (file)
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -316,6 +316,10 @@ static int cache_out_filter(ap_filter_t *f, apr_bucket_brigade *bb)
     ap_log_error(APLOG_MARK, APLOG_DEBUG | APLOG_NOERRNO, 0, r->server,
             "cache: running CACHE_OUT filter");
 
+    /* XXX: Wouldn't it be better to do read_entity_headers when we 
+     * opened the cache entity? This would better accomodate implementations 
+     * that stored headers and the entity body in seperate files.
+     */
     cache_read_entity_headers(cache->handle, r);    
     cache_read_entity_body(cache->handle, bb);
 
@@ -392,6 +396,7 @@ static int cache_in_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
     /* check first whether running this filter has any point or not */
     if(r->no_cache) {
+       ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, in);
     }
 

diff --git a/modules/experimental/mod_cache.h b/modules/experimental/mod_cache.h
index d9d2979c409f97cbfad8dd56db68bad9fd23d10b..5399651d7b7617f3ada27f5ef7af0e76a9003158 100644 (file)
--- a/modules/experimental/mod_cache.h
+++ b/modules/experimental/mod_cache.h
@@ -117,7 +117,7 @@
 
 /* default completion is 60% */
 #define DEFAULT_CACHE_COMPLETION (60)
-
+#define MAX_URL_LENGTH 1024
 #define MSEC_ONE_DAY ((apr_time_t)(86400*APR_USEC_PER_SEC)) /* one day, in microseconds */
 #define MSEC_ONE_HR  ((apr_time_t)(3600*APR_USEC_PER_SEC))  /* one hour, in microseconds */
 #define MSEC_ONE_MIN  ((apr_time_t)(60*APR_USEC_PER_SEC))   /* one minute, in microseconds */