From: Jeff Trawick <trawick@apache.org>
Date: Wed, 17 Dec 2003 15:53:10 +0000 (+0000)
Subject: document a relatively complex merge request necessary for resolving
X-Git-Tag: 2.0.49~282
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e6560f458bb3f265990cbe237de3d34fb7c32ee;p=thirdparty%2Fapache%2Fhttpd.git

document a relatively complex merge request necessary for resolving
several PRs


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

diff --git a/STATUS b/STATUS
index e22683bc68e..a555bd4177a 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/16 22:24:28 $]
+Last modified at [$Date: 2003/12/17 15:53:10 $]
 
 Release:
 
@@ -175,13 +175,40 @@ PATCHES TO BACKPORT FROM 2.1
       modules/metadata/mod_expires.c r1.45
       +1: ken, stoddard, rederpj
 
+    * PREREQ for a couple of fixes (mod_cgid daemon restart, stranded
+      piped logger processes) - ap_mpm_query(AP_MPMQ_MPM_STATE)
+      No updates are available at present for the BeOS or OS/2 MPMs,
+      but that is not a showstopper for the other changes.
+
+        server/mpm/prefork/prefork.c r1.284
+        server/mpm/worker/worker.c r1.142
+        server/mpm/experimental/leader/leader.c r1.35
+        server/mpm/experimental/threadpool/threadpool.c r1.23
+        server/mpm/netware/mpm_netware.c r1.78
+      +1: trawick
+
+        server/mpm/winnt/mpm_winnt.c r1.303
+        server/mpm/winnt/mpm_winnt.h r1.44
+        server/mpm/winnt/child.c r1.21
+      +1: trawick (concept; I have no business coding/reviewing
+        such issues in this MPM :) )
+
     * mod_cgid: Restart the cgid daemon if it crashes.  PR 19849
-        modules/generators/mod_cgid.c 1.152
-        +1: 
-        oops, also needs:
-        . 2.1-dev Unix MPM support to query MPM state
-        . 2.1-dev fix to prevent bogus message about parent crashing when
-          it is "merely" a restarted cgid daemon which crashed
+        modules/generators/mod_cgid.c r1.152, r1.161
+        server/mpm_common.c r1.111
+        PREREQ: ap_mpm_query(mpm-state) support in Unix MPMs
+        +1: trawick
+
+    * piped log programs respawning after Apache is stopped. PR 24805
+      bogus "piped log program '(null)' failed" messages during
+      restart. PR 21648.  Two people have tested a similar log.c patch
+      and the worker.c patch and given feedback in PR 24805.
+        server/log.c r1.137
+        PREREQ: ap_mpm_query(mpm-state) support in MPMs
+        (If an MPM is used that doesn't support the query, a complaint
+        will be written to the error log when a piped log program
+        terminates, and it won't get restarted.)
+        +1: trawick
 
     * ab: catch out of memory (reasoning report ID 29)
         support/ab.c: r1.125