From: Graham Leggett <minfrin@apache.org>
Date: Tue, 3 Nov 2015 13:27:54 +0000 (+0000)
Subject: mod_cache: Accept HT (Horizontal Tab) when parsing cache related header
X-Git-Tag: 2.4.18~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff56fd3af7741d9d772408020d4305f54d889629;p=thirdparty%2Fapache%2Fhttpd.git

mod_cache: Accept HT (Horizontal Tab) when parsing cache related header
           fields as described in RFC7230. See OWS definition.
Submitted by: jailletc36
Reviewed by: ylavic, minfrin


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1712293 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 195bf88bd0d..89bbef28dff 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.18
 
+  *) mod_cache: Accept HT (Horizontal Tab) when parsing cache related header
+     fields as described in RFC7230. [Christophe Jaillet]
+
   *) core/util_script: making REDIRECT_URL a full URL is now opt-in
      via new 'QualifyRedirectURL' directive.
 
diff --git a/STATUS b/STATUS
index c8361f340b3..43f70b958ae 100644
--- a/STATUS
+++ b/STATUS
@@ -118,16 +118,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, jim, minfrin
 
-   * mod_cache: Accept HT (Horizontal Tab) when parsing cache related header
-                fields as described in RFC7230. See OWS definition.
-                [Christophe Jaillet, Graham Leggett]
-     trunk patch: http://svn.apache.org/r1710723
-     2.4.x trunk works (modulo CHANGES)
-     +1: jailletc36, ylavic, minfrin
-     jailletc36: CHANGES entry could be tweaked to speak about OWS as per RFC7230
-                 instead of RFC2616
-     ylavic: simple s/RFC2616/RFC7230/ in CHANGES entry would be fine IMO.
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/cache/cache_util.h b/modules/cache/cache_util.h
index 59436c428d4..397efb90db7 100644
--- a/modules/cache/cache_util.h
+++ b/modules/cache/cache_util.h
@@ -99,7 +99,7 @@ extern "C" {
 #define CACHE_LOCKNAME_KEY "mod_cache-lockname"
 #define CACHE_LOCKFILE_KEY "mod_cache-lockfile"
 #define CACHE_CTX_KEY "mod_cache-ctx"
-#define CACHE_SEPARATOR ",   "
+#define CACHE_SEPARATOR ", \t"
 
 /**
  * cache_util.c