propose another merge

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

diff --git a/STATUS b/STATUS
index ca0d66f8ddca51a0bf1e6d16f0b77b2f3f6bf765..6909244fb87fa09827566dc45233defa019a02e4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/06/23 13:18:49 $]
+Last modified at [$Date: 2003/06/23 20:21:06 $]
 
 Release:
 
@@ -242,6 +242,10 @@ PATCHES TO PORT FROM 2.1
     * Backport wildcard ExpiresByType from 2.0.46
       +1: ken, stoddard
 
+    * mod_cgid: Restart the cgid daemon if it crashes.  PR 19849
+        modules/generators/mod_cgid.c 1.152
+        +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,