]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
PR 64339 has been backported and closed.
authorChristophe Jaillet <jailletc36@apache.org>
Mon, 1 Apr 2024 08:50:00 +0000 (08:50 +0000)
committerChristophe Jaillet <jailletc36@apache.org>
Mon, 1 Apr 2024 08:50:00 +0000 (08:50 +0000)
So remove it from the PATCHES/ISSUES THAT ARE BEING WORKED section.

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

STATUS

diff --git a/STATUS b/STATUS
index ddcdf29948970b1f9190e8be29680442ecd80b02..4dfd00306fa46ee77c846389de1c13f2a18bd268 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -205,16 +205,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]
 
-  *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
-     trunk patch: http://svn.apache.org/r1884505
-     2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .
-     +1:
-     jailletc36: there has been some discussion about how to fix the issue.
-     I'm not sure that the commit above is the best solution
-     and other alternatives have been discussed in PR 64339.  If r1884505
-     is not the right fix, then it should be removed from trunk.
-     Putting it here is a way to revive the discussion
-
   *) core: Initialize the request fields on read failure to avoid NULLs.
      trunk patch: http://svn.apache.org/r1893030
                   http://svn.apache.org/r1893044