From: Jim Jagielski <jim@apache.org>
Date: Tue, 10 Aug 2010 19:06:37 +0000 (+0000)
Subject: And flow up
X-Git-Tag: 2.2.17~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eda6c87ae574844405f24ccaa276ae6f413a0ec6;p=thirdparty%2Fapache%2Fhttpd.git

And flow up


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

diff --git a/STATUS b/STATUS
index 8ca078d08a0..db2f4ec07a9 100644
--- a/STATUS
+++ b/STATUS
@@ -99,6 +99,20 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2 patch: trunk patch works with offset
      +1: sf, rpluem, trawick, jim
 
+   * core: (re)-introduce -T commandline option to suppress documentroot
+     check at startup
+     PR 41887
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=893027
+     2.2 patch: trunk patch Works with offset.
+     +1: niq, rpluem, jim
+
+   * VHosts: fix parsing of pure-numeric hostname.
+     PR 44979
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=832172
+     2.2 patch: trunk patch Works with offset.
+     +1: niq, rpluem, jim
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -231,19 +245,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          stop character array and error on all control characters not
          allowed by HTTP.
 
-   * core: (re)-introduce -T commandline option to suppress documentroot
-     check at startup
-     PR 41887
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=893027
-     2.2 patch: trunk patch Works with offset.
-     +1: niq, rpluem, jim
-
-   * VHosts: fix parsing of pure-numeric hostname.
-     PR 44979
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=832172
-     2.2 patch: trunk patch Works with offset.
-     +1: niq, rpluem, jim
-
    * config: fix/optimize SSL connections for IE6 browsers
      PR 49484
      Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=966055