From: Bill Stoddard <stoddard@apache.org>
Date: Wed, 5 Jun 2002 21:49:16 +0000 (+0000)
Subject: Hummm. not entirely sure if ap_meets_conditions() does everything we need it
X-Git-Tag: 2.0.37~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6466463c7374ba0cda7340d6ba0916449c1478c;p=apache

Hummm. not entirely sure if ap_meets_conditions() does everything we need it
to do in a proxy cache... will study more later.


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

diff --git a/modules/experimental/mod_cache.c b/modules/experimental/mod_cache.c
index 694546d5bb..e1a3bc2056 100644
--- a/modules/experimental/mod_cache.c
+++ b/modules/experimental/mod_cache.c
@@ -207,6 +207,16 @@ static int cache_url_handler(request_rec *r, int lookup)
             if (lookup) {
                 return OK;
             }
+            rv = ap_meets_conditions(r);
+            if (rv != OK) {
+                ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
+                             "cache: fresh cache - returning status %d", rv);
+                return rv;
+            }
+
+            /*
+             * Not a conditionl request. Serve up the content 
+             */
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                          "cache: fresh cache - add cache_out filter and "
                          "handle request");