Ensure that we call ap_meets_conditions() in the mod_cache normal handler

case, so that conditional requests are handled properly.

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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 6dbb56d20cceb8e838779a3d0bec0b5a1ac4bfd5..3df61c3873f3a1b34507fab9f9023b2d634d1c57 100644 (file)
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -463,6 +463,11 @@ static int cache_handler(request_rec *r)
         return DECLINED;
     }
 
+    rv = ap_meets_conditions(r);
+    if (rv != OK) {
+        return rv;
+    }
+
     /* Serve up the content */
 
     /*