From: Colm MacCarthaigh <colm@apache.org>
Date: Thu, 13 Apr 2006 08:56:55 +0000 (+0000)
Subject: Review and vote on two quick patches. Promote one to accepted.
X-Git-Tag: 2.2.2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1445eed92711fb86f920c2e1b9f61e4432af8df;p=thirdparty%2Fapache%2Fhttpd.git

Review and vote on two quick patches. Promote one to accepted.


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

diff --git a/STATUS b/STATUS
index d591657094e..7f5c45c9517 100644
--- a/STATUS
+++ b/STATUS
@@ -74,6 +74,13 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
+    * htdbm: Warn when the user adds a plaintext password on a platform
+      with crypt().  The server will assume that the format is crypt().
+        Trunk version of patch:
+          http://svn.apache.org/viewcvs?rev=392944&view=rev
+        2.2.x version of patch:
+          Trunk version works
+      +1: trawick, rpluem, colm
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
@@ -91,19 +98,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       -1 bnicholes - The authorization refactoring that was done is for 2.3 and above.
                      This can not be backported to 2.2.
 
-    * htdbm: Warn when the user adds a plaintext password on a platform
-      with crypt().  The server will assume that the format is crypt().
-        Trunk version of patch:
-          http://svn.apache.org/viewcvs?rev=392944&view=rev
-        2.2.x version of patch:
-          Trunk version works
-      +1: trawick, rpluem
-
     * htdbm: Fix crash in 64-bit mode on HP-UX caused by unexpected
       placement of crypt() prototype (unistd.h).
         Trunk version of patch:
           http://svn.apache.org/viewcvs?rev=393364&view=rev
         2.2.x version of patch:
           Trunk version works
-      +1: trawick
+      +1: trawick, colm