From c951f5e9998457d685ebb1f455985d5dc672050f Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Mon, 15 Aug 2011 20:09:38 +0000 Subject: [PATCH] mod_cache: Fix the moving of the CACHE filter, which erroneously stood down if the original filter was not added by configuration. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1157976 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/cache/mod_cache.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 3ac4a45ec8..b05bf213fe 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,10 @@ -*- coding: utf-8 -*- Changes with Apache 2.3.15 + *) mod_cache: Fix the moving of the CACHE filter, which erroneously + stood down if the original filter was not added by configuration. + [Graham Leggett] + *) mod_ssl: improve certificate error logging. PR 47408. [Kaspar Brand] *) mod_authz_groupfile: Increase length limit of lines in the group file to diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 40daced9eb..96b25e6331 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -320,10 +320,10 @@ static int cache_replace_filter(ap_filter_t *next, ap_filter_rec_t *from, ap_filter_rec_t *to, ap_filter_rec_t *stop) { ap_filter_t *ffrom = NULL, *fto = NULL; while (next && next->frec != stop) { - if (next->frec == from && !next->ctx) { + if (next->frec == from) { ffrom = next; } - if (next->frec == to && !next->ctx) { + if (next->frec == to) { fto = next; } next = next->next; -- 2.40.0