From f1fea33d2e396aaf9baead6a28de6b5f0c291ffb Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Fri, 5 Jul 2019 07:25:19 +0000 Subject: [PATCH] vote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862590 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/STATUS b/STATUS index a7e9eaaa106..4e5cf0b0a72 100644 --- a/STATUS +++ b/STATUS @@ -139,6 +139,25 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x: svn merge -c 1491700,1862200 ^/httpd/httpd/trunk . works [needs CHANGES] +1: jorton, jim, icing + *) 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, jim, icing + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -192,25 +211,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk . +1: jailletc36, jim - *) 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, jim - *) mod_socache_shmcb: fix gcc 9 warnings trunk: http://svn.apache.org/r1858565 2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk . -- 2.47.3