Propose.

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

diff --git a/STATUS b/STATUS
index 9cb429b0a32eb8fd334c71cd435bfed2a7a668c2..64b3d73e126c330aaff45614a8e31ea6b662a2f7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -137,9 +137,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1851552
      2.4.x patch: svn merge -c 1850835,1851552 ^/httpd/httpd/trunk .
      +1: jailletc36, jim, ylavic
-     ylavic: I agree w/ joe's response on dev@ for r1850835 (no functional
-             change btw), while the warning addressed by r1850834 is annoying
-             for 2.4.38.
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -349,6 +346,24 @@ PATCHES/ISSUES THAT ARE BEING WORKED
              for internal users of this api; not sure if performance
              impact is significant from using malloc here.
 
+  *) mod_proxy_http: forward 100-continue, and minimize race conditions when
+     reusing backend connections. PR 60330.
+     trunk patch: http://svn.apache.org/r1656259
+                  http://svn.apache.org/r1656359
+                  http://svn.apache.org/r1721759
+                  http://svn.apache.org/r1729507
+                  http://svn.apache.org/r1729749
+                  http://svn.apache.org/r1754159
+                  http://svn.apache.org/r1807318
+                  http://svn.apache.org/r1836588
+                  http://svn.apache.org/r1836648
+                  http://svn.apache.org/r1836716
+                  http://svn.apache.org/r1836750
+                  http://svn.apache.org/r1837040
+                  http://svn.apache.org/r1853407
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue.patch
+     +1: ylavic
+
 
 PATCHES/ISSUES THAT ARE STALLED