propose another merge

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

diff --git a/STATUS b/STATUS
index a5f903f21935c892a606425b83f94c7872814b89..e1efae23979fe0f26a3dc339249476af9ea35ea8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/12/10 16:48:45 $]
+Last modified at [$Date: 2003/12/10 19:56:42 $]
 
 Release:
 
@@ -354,6 +354,13 @@ PATCHES TO BACKPORT FROM 2.1
         modules/generators/mod_status.h r1.2
       +1: trawick
 
+    * fix memory leak while handling request body with reverse proxy
+        modules/proxy/proxy_http.c r1.173
+        (but code has changed slightly since stable branch so patch
+        posted to bugzilla is one to use...  see PR at
+        http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24991)
+      +1: trawick
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,