the directives ignorecachecontrol & ignorelastmodified weren't being set

properly for virtual hosts.

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

diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index d55a099752364c7e51512561ce340eed79238422..8b29d35bd9200ecb41e5c90b370cea8c7b114353 100644 (file)
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -153,7 +153,7 @@ static int cache_url_handler(request_rec *r, int lookup)
      * - Pragma: no-cache
      * - Any requests requiring authorization.
      */
-    if (conf->ignorecachecontrol_set == 1 && conf->ignorecachecontrol == 1 && auth == NULL) {
+    if (conf->ignorecachecontrol == 1 && auth == NULL) {
         ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
             "incoming request is asking for a uncached version of %s, but we know better and are ignoring it", url);
     }
@@ -799,11 +799,11 @@ static void * merge_cache_config(apr_pool_t *p, void *basev, void *overridesv)
         (overrides->complete_set == 0) ? base->complete : overrides->complete;
 
     ps->no_last_mod_ignore =
-        (overrides->no_last_mod_ignore_set) ? 
+        (overrides->no_last_mod_ignore_set == 0) ? 
                     base->no_last_mod_ignore : 
                     overrides->no_last_mod_ignore;
     ps->ignorecachecontrol  =
-        (overrides->ignorecachecontrol_set) ? 
+        (overrides->ignorecachecontrol_set == 0) ? 
                     base->ignorecachecontrol : 
                     overrides->ignorecachecontrol;