From: Yann Ylavic <ylavic@apache.org>
Date: Wed, 14 May 2014 17:59:04 +0000 (+0000)
Subject: Provide a single 2.4.x patch where multiple trunk commits are involved.
X-Git-Tag: 2.4.10~232
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abaccdc393faa261c92abb23a24651389b7a9a81;p=apache

Provide a single 2.4.x patch where multiple trunk commits are involved.

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

diff --git a/STATUS b/STATUS
index 3b26ff97e4..a15b5ac120 100644
--- a/STATUS
+++ b/STATUS
@@ -149,7 +149,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1572911
      Submitted by: [Christoph Fausak <christoph fausak glueckkanja com>]
      Committed by: ylavic
-     2.4.x patch: trunk works
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_cache-flush_end_of_stream.patch
      +1: ylavic
      ylavic: does not depend on r1572092 or r1572655 and al above,
              these proposals can be backported in any order.
@@ -192,7 +192,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1591322
                   http://svn.apache.org/r1591390
                   http://svn.apache.org/r1591394
-     2.4.x patch: trunk patch works modulo CHANGES
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_cache-strip_304_entity_headers.patch
      +1: ylavic, jim
 
    * mod_proxy_wstunnel: Fix the use of SSL connections with the "wss:" scheme.