propose merge

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

diff --git a/STATUS b/STATUS
index ec49df94c60cb204dbfd310fa5da683687016ca8..ee46cd0ded03e9fbbc93127ce1d9cd699b976b5c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/02/21 15:12:46 $]
+Last modified at [$Date: 2004/02/21 18:30:11 $]
 
 Release:
 
@@ -80,8 +80,13 @@ 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! ]
 
+    * mod_setenvif: remove support for remote_user variable which never
+      worked at all. PR 25725 (2.0 + 1.3)
+        modules/metadata/mod_setenvif.c: r1.50
+      +1: nd
+
     * mod_ldap: Fix segfault when shared memory caching is disabled 
-      modules/experimental/util_ldap_cache_mgr.c: r1.15 
+        modules/experimental/util_ldap_cache_mgr.c: r1.15 
       +1: bnicholes minfrin
     
     * mod_ssl: Clear OpenSSL error stack during pphrase entry to prevent