From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 13 Mar 2008 07:28:40 +0000 (+0000)
Subject: * Do not do Range requests if we use our own conditionals for validating
X-Git-Tag: 2.3.0~876
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1fb72c6dd20ca09802351dc3ad4a0cdc6b225371;p=thirdparty%2Fapache%2Fhttpd.git

* Do not do Range requests if we use our own conditionals for validating
  a cache entity: If we get 304 the Range does not matter and otherwise the
  entity changed and we want to have the complete entity.

PR: 44579


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

diff --git a/modules/cache/cache_storage.c b/modules/cache/cache_storage.c
index 0ddf82dd39f..7b99f3eda91 100644
--- a/modules/cache/cache_storage.c
+++ b/modules/cache/cache_storage.c
@@ -286,6 +286,13 @@ int cache_select(request_rec *r)
                 apr_table_unset(r->headers_in, "If-Range");
                 apr_table_unset(r->headers_in, "If-Unmodified-Since");
 
+                /*
+                 * Do not do Range requests with our own conditionals: If
+                 * we get 304 the Range does not matter and otherwise the
+                 * entity changed and we want to have the complete entity
+                 */
+                apr_table_unset(r->headers_in, "Range");
+
                 etag = apr_table_get(h->resp_hdrs, "ETag");
                 lastmod = apr_table_get(h->resp_hdrs, "Last-Modified");