From: Graham Leggett <minfrin@apache.org>
Date: Thu, 21 Oct 2010 23:00:09 +0000 (+0000)
Subject: Be compliant with RFC2616 14.46, revalidation failed is Warning 111, not
X-Git-Tag: 2.3.9~244
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8de51904459a0a416b66639dfb2835b39c0c4f2f;p=apache

Be compliant with RFC2616 14.46, revalidation failed is Warning 111, not
Warning 110.


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

diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
index bc95a21a56..bbdec894e1 100644
--- a/modules/cache/mod_cache.c
+++ b/modules/cache/mod_cache.c
@@ -808,12 +808,12 @@ static int cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
 
             r->headers_out = cache->stale_handle->resp_hdrs;
 
-            /* add a stale warning */
+            /* add a revalidation warning */
             warn_head = apr_table_get(r->err_headers_out, "Warning");
             if ((warn_head == NULL) || ((warn_head != NULL)
-                    && (ap_strstr_c(warn_head, "110") == NULL))) {
+                    && (ap_strstr_c(warn_head, "111") == NULL))) {
                 apr_table_mergen(r->err_headers_out, "Warning",
-                        "110 Response is stale");
+                        "111 Revalidation failed");
             }
 
             cache_run_cache_status(cache->handle, r, r->headers_out, AP_CACHE_HIT,
@@ -1621,12 +1621,12 @@ static void cache_insert_error_filter(request_rec *r)
 
             r->err_headers_out = cache->stale_handle->resp_hdrs;
 
-            /* add a stale warning */
+            /* add a revalidation warning */
             warn_head = apr_table_get(r->err_headers_out, "Warning");
             if ((warn_head == NULL) || ((warn_head != NULL)
-                    && (ap_strstr_c(warn_head, "110") == NULL))) {
+                    && (ap_strstr_c(warn_head, "111") == NULL))) {
                 apr_table_mergen(r->err_headers_out, "Warning",
-                        "110 Response is stale");
+                        "111 Revalidation failed");
             }
 
             cache_run_cache_status(