From 11a01ec97a017dde8ac945e269e416d6e9ba5f40 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sat, 12 Feb 2011 19:02:58 +0000 Subject: [PATCH] mod_cache: When a bad Expires date is present, we need to behave as if the Expires is in the past, not as if the Expires is missing. PR 16521. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1070128 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 4 ++++ modules/cache/mod_cache.c | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 103725ed87..f0554a8958 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,10 @@ Changes with Apache 2.3.11 + *) mod_cache: When a bad Expires date is present, we need to behave as if + the Expires is in the past, not as if the Expires is missing. PR 16521. + [Co-Advisor ] + *) mod_cache: We must ignore quoted-string values that appear in a Cache-Control header. PR 50199. [Graham Leggett] diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c index 3e8a5d671f..1faa2e745e 100644 --- a/modules/cache/mod_cache.c +++ b/modules/cache/mod_cache.c @@ -837,9 +837,7 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in) exps = apr_table_get(r->headers_out, "Expires"); } if (exps != NULL) { - if (APR_DATE_BAD == (exp = apr_date_parse_http(exps))) { - exps = NULL; - } + exp = apr_date_parse_http(exps); } else { exp = APR_DATE_BAD; -- 2.50.0