From: Guenter Knauf <fuankg@apache.org>
Date: Thu, 30 Sep 2010 00:02:02 +0000 (+0000)
Subject: promote.
X-Git-Tag: 2.0.64~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=662ed9cfbb3ae7fbc218f9db1dc3dd0e440c93fc;p=thirdparty%2Fapache%2Fhttpd.git

promote.


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

diff --git a/STATUS b/STATUS
index 1c919e66664..9f63929e3e1 100644
--- a/STATUS
+++ b/STATUS
@@ -122,6 +122,14 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+  * gen_test_char.c: enable building gen_test_char for running on build machine
+    when cross-compiling. The patch doesnt introduce code changes for any
+    platform unless CROSS_COMPILE is defined. 
+    Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=795438
+    2.2.x patch: http://svn.apache.org/viewvc?view=rev&revision=795971
+    Backport: http://people.apache.org/~fuankg/diffs/gen_test_char.c_httpd_2_0_x-backport-r795971.diff
+    +1: fuankg, trawick, rjung
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ please place SVN revisions from trunk here, so it is easy to
     identify exactly what the proposed changes are!  Add all new
@@ -163,14 +171,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              if (nLogFD == NULL) {
                  /* Uh-oh. Failed to open the new log file. Try to clear
 
-  * gen_test_char.c: enable building gen_test_char for running on build machine
-    when cross-compiling. The patch doesnt introduce code changes for any
-    platform unless CROSS_COMPILE is defined. 
-    Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=795438
-    2.2.x patch: http://svn.apache.org/viewvc?view=rev&revision=795971
-    Backport: http://people.apache.org/~fuankg/diffs/gen_test_char.c_httpd_2_0_x-backport-r795971.diff
-    +1: fuankg, trawick, rjung
-
   * pcre: update config.guess and config.sub for better platform support.
     Trunk version of patch:
       Does not apply.