]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add comment about how to merge CHANGES entry wrt r1587201.
authorYann Ylavic <ylavic@apache.org>
Tue, 15 Jul 2014 14:42:31 +0000 (14:42 +0000)
committerYann Ylavic <ylavic@apache.org>
Tue, 15 Jul 2014 14:42:31 +0000 (14:42 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1610717 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 5cead0dbf68aa63c0a2af44f038fdbe403c539e7..8b21dd2528203bb95731eadf8761d896f9b45082 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -161,6 +161,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~ylavic/httpd-2.2.x-mod_proxy_sni_reuse3.patch
      +1: ylavic, rpluem
      ylavic: MMN bump in patch #3
+     ylavic: Changelog is missing in the above patches, it was added in 2.4.x
+             by r1599597 (with others...) and fixed by r1610670 (missing
+             "mod_proxy:" prefix).
 
    * mod_deflate: Fix reentrance in output and input filters (buffering of
                   incomplete Zlib header or validation bytes). PR 46146.