Commit 92338621 authored by Andre Malo's avatar Andre Malo
Browse files

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
parent f9318354

STATUS

+5 −1
Changes for STATUS: 5 added lines, 1 removed line.
Original line number Diff line number Diff line 
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