From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 21 Oct 2016 21:26:27 +0000 (+0000)
Subject: Vote (adding relevent entries part of the backport proposal).
X-Git-Tag: 2.4.24~183
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=810b21efce24a0ada362abe5c8e1e203d4f87308;p=thirdparty%2Fapache%2Fhttpd.git

Vote (adding relevent entries part of the backport proposal).

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

diff --git a/STATUS b/STATUS
index da3ee2271b8..486d51b95e9 100644
--- a/STATUS
+++ b/STATUS
@@ -228,6 +228,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
   *) mod_cache: Bring up-to-date w/ trunk.
      trunk patch:
+        try to use the key of a possible open but stale cache entry (PR 50317)
+            http://svn.apache.org/r1597533
+        socache_mc_store: Pass through expiration time.
+            http://svn.apache.org/r1649491
+        Preserve the Content-Type in case of 304 response
+            http://svn.apache.org/r1665216
         Use the actual URI path and query-string (PR 21935)
             http://svn.apache.org/r1756553
             http://svn.apache.org/r1756631
@@ -238,7 +244,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         Rename ap_casecmpstr[n]() to ap_cstr_casecmp[n](), update with APR doxygen
             http://svn.apache.org/r1747469 
      2.4.x patch: http://home.apache.org/~jim/patches/httpd-2.4-cache.patch.txt
-     +1: jim
+     +1: jim, ylavic
+     ylavic: r1756553 and r1649491 have a CHANGES entry.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED