summaryrefslogtreecommitdiffstats
path: root/modules/cache
diff options
context:
space:
mode:
authorYann Ylavic <ylavic@apache.org>2014-04-30 18:34:15 +0200
committerYann Ylavic <ylavic@apache.org>2014-04-30 18:34:15 +0200
commitf33d6826670e7defafff125d115b3a1b56c18381 (patch)
treea7336d05f2ed060d7046396d7229d491ee30efff /modules/cache
parentmod_cache: Preserve non-cacheable headers forwarded from an origin 304 (diff)
downloadapache2-f33d6826670e7defafff125d115b3a1b56c18381.tar.xz
apache2-f33d6826670e7defafff125d115b3a1b56c18381.zip
mod_cache: follow up to r1591322
Avoid one unnecessary test when checking 304 contradictions. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1591390 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/cache')
-rw-r--r--modules/cache/mod_cache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index 74c559c727..042e0e042f 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -1134,7 +1134,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
* as per RFC2616 Section 10.3.5
*/
if (cache_header_cmp(r->pool, left, right, "ETag")) {
- ehs = (ehs) ? apr_pstrcat(r->pool, ehs, ", ETag", NULL) : "ETag";
+ ehs = "ETag";
}
for (eh = MOD_CACHE_ENTITY_HEADERS; *eh && !reason; ++eh) {
if (cache_header_cmp(r->pool, left, right, *eh)) {