]> granicus.if.org Git - apache/commitdiff
Vote, promote.
authorGraham Leggett <minfrin@apache.org>
Sun, 16 Dec 2012 11:29:46 +0000 (11:29 +0000)
committerGraham Leggett <minfrin@apache.org>
Sun, 16 Dec 2012 11:29:46 +0000 (11:29 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1422530 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 790cc36f4938d62a2b66d6954b68f1eee07af6af..967e835573a70db103e619ada394d5a9f8d0cb70 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -98,6 +98,14 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk patch works
      +1: minfrin, jim, gsmith
 
+   * mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.
+     PR 40841.
+     trunk patch: http://svn.apache.org/viewvc?rev=1404625&view=rev
+                  http://svn.apache.org/viewvc?rev=1420223&view=rev
+     2.4.x patch: trunk patch works, or
+                  http://people.apache.org/~jorton/proxyftpepsv-24.patch
+     +1: jorton, jim, minfrin
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -132,14 +140,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: http://people.apache.org/~rjung/patches/proxypassinherit-config.patch
      +1: rjung, jim
 
-   * mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records.
-     PR 40841.
-     trunk patch: http://svn.apache.org/viewvc?rev=1404625&view=rev
-                  http://svn.apache.org/viewvc?rev=1420223&view=rev
-     2.4.x patch: trunk patch works, or
-                  http://people.apache.org/~jorton/proxyftpepsv-24.patch
-     +1: jorton, jim
-
    * mod_imagemap: Fix type mismatch.
      trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1416889
      2.4.x patch: trunk patch works