From d4fae4195d86bde02ffa190a321f89ffc6249a2b Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Thu, 11 Jul 2019 14:24:31 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1862930 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/STATUS b/STATUS index c73939fb775..eb58ea5ceac 100644 --- a/STATUS +++ b/STATUS @@ -153,6 +153,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1851146 ^/httpd/httpd/trunk . +1: jailletc36, jim, icing + *) 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, icing, jim + + *) mod_socache_shmcb: fix gcc 9 warnings + trunk: http://svn.apache.org/r1858565 + 2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk . + +1: jorton, icing, jim + + *) mod_proxy_hcheck fix for BZ 60948 + trunk: http://svn.apache.org/r1862014 + 2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk . + +1: jfclere, icing, jim + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -194,21 +209,6 @@ 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, icing, jim - - *) mod_socache_shmcb: fix gcc 9 warnings - trunk: http://svn.apache.org/r1858565 - 2.4.x: svn merge -c 1858565 ^/httpd/httpd/trunk . - +1: jorton, icing, jim - - *) mod_proxy_hcheck fix for BZ 60948 - trunk: http://svn.apache.org/r1862014 - 2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk . - +1: jfclere, icing, jim - *) mod_http2: fixes Timeout vs. KeepAliveTimeout behaviour, see PR 63534. Fixes stream cleanup when connection throttling is in place. Counts stream resets by client on streams initiated by client as cause for connection throttling. -- 2.47.3