More backports

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

diff --git a/STATUS b/STATUS
index 0ae24b53477e5ac985dd50e7fda1630395e7b28c..e03cb6e607a90657e6501963126e4ec78f847130 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -242,6 +242,16 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: trunk patch works
       +1: jim
 
+   *) mod_proxy: Always retrieve conditional function.
+      trunk patch: http://svn.apache.org/r1836383
+      2.4.x patch: trunk patch works
+      +1: jim
+
+   *) http: Enforce consistently no response body with both 204 and 304 statuses.
+      trunk patch: http://svn.apache.org/r1837056
+      2.4.x patch: https://home.apache.org/~jim/patches/response-204-304.patch
+      +1: jim
+   
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]