From: André Malo <nd@apache.org>
Date: Wed, 5 May 2004 06:17:47 +0000 (+0000)
Subject: propose a merge
X-Git-Tag: 2.0.50~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57d9899f9652f07d7e249a2e47b4ab424393c361;p=thirdparty%2Fapache%2Fhttpd.git

propose a merge


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

diff --git a/STATUS b/STATUS
index 6a16a2ed76a..87f2dbda3a4 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/05/03 22:32:37 $]
+Last modified at [$Date: 2004/05/05 06:17:47 $]
 
 Release:
 
@@ -72,6 +72,10 @@ PATCHES TO BACKPORT FROM 2.1
   [ please place file names and revisions from HEAD here, so it is easy to
     identify exactly what the proposed changes are! ]
 
+    *) Readd suexec setuid and user check (now APR supports it)
+         os/unix/unixd.c: r1.69
+       +1: nd
+
     *) Prevent Win32 pool corruption at startup
          server/mpm/winnt/child.c: r1.36 
        +1: ake