Propose

[skip ci]

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

diff --git a/STATUS b/STATUS
index b00ce2df0936ca9b614b060e4b8d8f84a8147396..7736d75d65c5bfbc9170a34cf1af0552b993e7ed 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -170,6 +170,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: ivan
      +0: jorton - falls under RTC exception for "non-Unix build"
 
+  *) Easy patches: synch 2.4.x and trunk
+        - ab: Increase MAX_CONCURRENCY hard limit (from 20K to 200K)
+        - ab: Fix X509 * leak
+        - dav/fs/dbm.c: Remove error message references to "property" databases
+        - httpd.h: Fix comment
+     trunk patch:
+        - https://svn.apache.org/r1910518
+          https://svn.apache.org/r1910847
+          https://svn.apache.org/r1912477
+          https://svn.apache.org/r1918297
+     2.4.x patch: svn merge -c 1910518,1910847,1912477,1918297 ^/httpd/httpd/trunk . 
+     +1: jailletc36,
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]