]> granicus.if.org Git - apache/commitdiff
Backported in r1834104.
authorYann Ylavic <ylavic@apache.org>
Fri, 22 Jun 2018 10:44:41 +0000 (10:44 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 22 Jun 2018 10:44:41 +0000 (10:44 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834105 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 619193fd3de63c2907dd749acec651a560b91c93..afa485c21a8cefebe7a10a3f71e26c5aeafe87e5 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -148,14 +148,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   svn merge -c 1833827 ^/httpd/httpd/trunk . 
      +1: covener, jim, rjung
 
-  *) mod_xml2enc: Fix forwarding of error metadata/responses. PR 62180.
-     trunk patch: http://svn.apache.org/r1829038
-                  http://svn.apache.org/r1829039
-                  http://svn.apache.org/r1830523
-     2.4.x patch: svn merge -c 1829038,1829039,1830523 ^/httpd/httpd/trunk .
-                  (trunk works modulo CHANGES))
-     +1: ylavic, jim, rpluem
-
   *) mod_cache: Handle case of invalid Expires header RFC compliant
                 like the case of an Expires time in the past.
                 So allow to overwrite the non-caching decision