* Update proposals

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

diff --git a/STATUS b/STATUS
index 94aa6114c35306eac949eb04a84c4f379511aa89..ff0c063e8e7af6a938b7ff5d3dc8329bd312e417 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -190,7 +190,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     Trunk version of patch:
        http://svn.apache.org/viewvc?rev=684341&view=rev
     Backport version for 2.2.x of patch:
-       Trunk version of patch works
+       Trunk version of patch works, but 
+       http://people.apache.org/~rpluem/patches/37770_2.2.x.diff
+       fixes a conflict regarding the needed minor bump.
     +1: rpluem, jim
 
  * mod_proxy_http: Introduce environment variable proxy-initial-not-pooled
@@ -200,6 +202,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    PR: 37770
     Trunk version of patch:
        http://svn.apache.org/viewvc?rev=684351&view=rev
+       http://svn.apache.org/viewvc?rev=686549&view=rev (doc)
     Backport version for 2.2.x of patch:
        Trunk version of patch works
     +1: rpluem,