Propose [skip ci]

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

diff --git a/STATUS b/STATUS
index 1861c579da87fb55162997893803c5e0c599312c..4c1048e25a941e736e5f10efd80f1215e9486ea1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -198,7 +198,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: CHANGES could also be looked at if it makes sense to update the terminology
                  also here
 
- *) strict content-length parsing
+  *) strict content-length parsing
      trunk patch http://svn.apache.org/r1877954
                  http://svn.apache.org/r1877955
                  http://svn.apache.org/r1879369
@@ -207,6 +207,22 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     +1: ylavic
     ylavic: the patch drops changes to apreq, which seems to not be in 2.4.
 
+  *) mod_ssl: deduplicate some code
+     mod_ssl: Use temporary pool for variable lookup results which don't need to live in pconf
+     mod_ssl: Factor out code to read a BIO into a palloc'ed string
+     mod_ssl: Use <16 character cname argument for socache ->init() per the API constraint
+     trunk patch http://svn.apache.org/r1705539
+                 http://svn.apache.org/r1877263
+                 http://svn.apache.org/r1877291
+                 http://svn.apache.org/r1879445
+     2.4.x patch: svn merge -c 1705539,1877263,1877291,1879445 ^/httpd/httpd/trunk .
+     +1: jailletc36,
+
+  *) core: Fix a signed/unsigned comparison
+     trunk patch http://svn.apache.org/r1864868
+     2.4.x patch: svn merge -c 1864868 ^/httpd/httpd/trunk .
+     +1: jailletc36,
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]