From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Thu, 3 Feb 2005 23:24:06 +0000 (+0000)
Subject: Propose one more, and note that I'm not going to risk the merge of dump_io.
X-Git-Tag: 2.0.53~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5fed5b3bf7bca42ff7f02cac5c70f4e7349a233;p=thirdparty%2Fapache%2Fhttpd.git

Propose one more, and note that I'm not going to risk the merge of dump_io.
I'll let someone else do that merge.  *hint*


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

diff --git a/STATUS b/STATUS
index d72c69f0837..8971414a03f 100644
--- a/STATUS
+++ b/STATUS
@@ -132,9 +132,10 @@ PATCHES TO BACKPORT FROM 2.1
     *) modules: Include mod_dumpio to the modules/experimental
        tree. Module included in 2.1:modules/debug.
        http://www.apache.org/~jim/mod_dumpio.c
-       +1: jim, trawick
+       jerenkrantz notes: I won't merge this myself because of the build system
+                          tweaks required to add the module.
+       +1: jim, trawick, jerenkrantz
        -0: nd (suggests the experimental directory instead)
-           jerenkrantz (ditto)
 
     *) Fix the RPM spec file so that an RPM build now works. An RPM
        build now requires system installations of APR and APR-util.
@@ -412,6 +413,10 @@ PATCHES TO BACKPORT FROM 2.1
       +1: thommay, jerenkrantz
       trawick: "which" isn't portable; I've suggested a work-around on dev@
 
+    * mod_proxy: Fix ProxyRemoteMatch.  PR 33170.
+      svn rev 151248
+      +1: jerenkrantz
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,