Proposals

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

diff --git a/STATUS b/STATUS
index 25b406b0d6284b95931d7f34e7afec1e0324bb02..f1306fca5b25407baa6720e2b68b58d7c62d1f88 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -177,6 +177,37 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      jailletc36: at least, r1853302 is required, IMHO
      minfrin: r1853302 is added in above, jim agrees
 
+  *) core: Fix a compilation error when GPROF is defined.
+     trunk patch: http://svn.apache.org/r1857859
+     2.4.x patch: svn merge -c 1857859 ^/httpd/httpd/trunk .
+     +1: jailletc36
+
+  *) cache_storage: be consistent when building a cache key value when CacheKeyBaseURL is used with
+                    an URL that contains a :port.
+                    PR 53915 [Rein Tollevik <rein basefarm.no>]
+     trunk: http://svn.apache.org/r1851146
+     2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk .
+     +1: jailletc36
+
+  *) easy patches to synch 2.4.x and trunk:
+        - core: extend description of r->hostname
+        - mod_proxy_http: Avoid memory allocation before making sure that this handler can handle the URL
+        - core: Save a few cycles in 'ap_parse_form_data()'
+        - mod_cache_socache: Save some cycles
+        - mod_proxy_ftp: Save some cycle
+        - vhost: move an assignment to the end of the loop to ease readability and please a compiler
+        - core: Be a little more verbose when an error in trigerred in 'ap_set_file_slot()'
+     trunk patch:
+        - http://svn.apache.org/r1426802
+        - http://svn.apache.org/r1744460
+        - http://svn.apache.org/r1829799
+        - http://svn.apache.org/r1824716
+        - http://svn.apache.org/r1838318
+        - http://svn.apache.org/r1840678
+        - http://svn.apache.org/r1861294
+     2.4.x patch: svn merge -c 1426802,1744460,1829799,1824716,1838318,1840678,1861294 ^/httpd/httpd/trunk . 
+     +1: jailletc36
+
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]