summaryrefslogtreecommitdiffstats
path: root/modules/cache/mod_cache.c
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2014-10-25 19:45:30 +0200
committerEric Covener <covener@apache.org>2014-10-25 19:45:30 +0200
commit94c4cc461f7d7d032198a8a53fd2e57fbaf68618 (patch)
tree9ba8e8751fe26d4c610e48046c5bb5c1f51cd742 /modules/cache/mod_cache.c
parentRebuild. (diff)
downloadapache2-94c4cc461f7d7d032198a8a53fd2e57fbaf68618.tar.xz
apache2-94c4cc461f7d7d032198a8a53fd2e57fbaf68618.zip
fix another case of 304 response sent to an unconditional request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1634237 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache/mod_cache.c')
-rw-r--r--modules/cache/mod_cache.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 6d909f03d2..5f478cd876 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -234,6 +234,11 @@ static int cache_quick_handler(request_rec *r, int lookup)
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, rv,
r, APLOGNO(00752) "Cache locked for url, not caching "
"response: %s", r->uri);
+ /* cache_select() may have added conditional headers */
+ if (cache->stale_headers) {
+ r->headers_in = cache->stale_headers;
+ }
+
}
}
else {