Easy proposals to synch a little trunk and 2.4.x

[skip ci]

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

diff --git a/STATUS b/STATUS
index d4f438bae1498db42723b0ffab3549750ce58179..382f72cfafeb46255ff21b9274ac3210da8afc7a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -217,6 +217,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              w.r.t. num_buckets > 1 and ease merging of r1895553, with r1895550 for
              correctness of active_daemons used in r1895553 and r1895630.
 
+  *) Easy backports:
+     - mod_deflate: be explicit when setting c->etag_opt = AP_DEFLATE_ETAG_ADDSUFFIX
+     - mod_proxy_balancer: add missing spaces in HTML output
+     - mod_proxy_http: Avoid a double call to apr_table_get()
+     - mod_ssl: Fix some typo and doxygen issues
+     trunk patch: http://svn.apache.org/r1586543
+                  http://svn.apache.org/r1889494
+                  http://svn.apache.org/r1892563
+                  http://svn.apache.org/r1892917
+     2.4.x patch: svn merge -c 1586543,1889494,1892563,1892917 ^/httpd/httpd/trunk .
+     +1: jailletc36, 
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]