From: Graham Leggett <minfrin@apache.org>
Date: Sun, 4 Oct 2009 16:03:03 +0000 (+0000)
Subject: Ensure that we call ap_meets_conditions() in the mod_cache normal handler
X-Git-Tag: 2.3.3~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f150bc9b040ef9a1489f9f6a8160261bac242f85;p=thirdparty%2Fapache%2Fhttpd.git

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 6dbb56d20cc..3df61c3873f 100644
--- 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 */
 
     /*