From: Jim Jagielski Date: Tue, 7 Jul 2020 16:53:55 +0000 (+0000) Subject: promote X-Git-Tag: 2.4.44~39 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f479bb6eabccf640fc62c7870a352b6c2092064;p=thirdparty%2Fapache%2Fhttpd.git promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1879596 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 0190517fe38..9e9e20f9058 100644 --- a/STATUS +++ b/STATUS @@ -135,7 +135,67 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) strict content-length parsing + trunk patch http://svn.apache.org/r1877954 + http://svn.apache.org/r1877955 + http://svn.apache.org/r1879369 + http://svn.apache.org/r1879373 + 2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-ap_parse_strict_length.patch + +1: ylavic, minfrin, jim + ylavic: the patch drops changes to apreq, which seems to not be in 2.4. + *) mod_ssl: deduplicate some code + mod_ssl: Use temporary pool for variable lookup results which don't need to live in pconf + mod_ssl: Factor out code to read a BIO into a palloc'ed string + mod_ssl: Use <16 character cname argument for socache ->init() per the API constraint + trunk patch http://svn.apache.org/r1705539 + http://svn.apache.org/r1877263 + http://svn.apache.org/r1877291 + http://svn.apache.org/r1879445 + 2.4.x patch: svn merge -c 1705539,1877263,1877291,1879445 ^/httpd/httpd/trunk . + +1: jailletc36, minfrin, jim + + *) core: Fix a signed/unsigned comparison + trunk patch http://svn.apache.org/r1864868 + 2.4.x patch: svn merge -c 1864868 ^/httpd/httpd/trunk . + +1: jailletc36, minfrin, jim + + *) core: Drop an invalid Last-Modified header value coming + from a (F)CGI script instead of replacing it with Unix epoch. + Warn the users about Last-Modified header value replacements + and violations of the RFC. + trunk patch: http://svn.apache.org/r1748379 + http://svn.apache.org/r1750747 + http://svn.apache.org/r1750749 + http://svn.apache.org/r1750953 + http://svn.apache.org/r1751138 + http://svn.apache.org/r1751139 + http://svn.apache.org/r1751147 + http://svn.apache.org/r1757818 + http://svn.apache.org/r1879253 + http://svn.apache.org/r1879348 + 2.4.x: trunk patches work, final view: + http://home.apache.org/~elukey/httpd-2.4.x-core-last_modified_tz_logging.patch + svn merge -c 1748379,1750747,1750749,1750953,1751138,1751139,1751139,1757818,1879253,r1879348 ^/httpd/httpd/trunk . + The code has been tested with a simple PHP script returning different Last-Modified + headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday, PST now). + +1: elukey, jorton, jim + jorton: +1 though I'd say log at WARN or INFO for the APR_BAD_DATE case + rather than "silently" (at normal log-level) dropping the parsed header? + [also nit: wrapping a lone ap_log_rerror(,APLOG_X) call in + if (APLOGrX(..) is unnecessary/redundant] + + *) mod_http2: connection terminology renamed to master/secondary. + trunk patch: http://svn.apache.org/r1878926 + http://svn.apache.org/r1879156 + 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-master-secondary.patch + +1: icing, ylavic, minfrin + ylavic: nitpicking, mixed "H2_secondary_IN" and "H2_secondary_OUT" case to + register the filters, but not for adding them. IIRC filters names + are case insentive so shouldn't matter, just popped at my eyes.. + icing: updated patch and added r1879156 to fix the eye bleed. + jailletc36: CHANGES could also be looked at if it makes sense to update the terminology + also here PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -186,43 +246,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1876511 ^/httpd/httpd/trunk . +1: jailletc36 (by inspection), jim - *) mod_http2: connection terminology renamed to master/secondary. - trunk patch: http://svn.apache.org/r1878926 - http://svn.apache.org/r1879156 - 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/h2-master-secondary.patch - +1: icing, ylavic, minfrin - ylavic: nitpicking, mixed "H2_secondary_IN" and "H2_secondary_OUT" case to - register the filters, but not for adding them. IIRC filters names - are case insentive so shouldn't matter, just popped at my eyes.. - icing: updated patch and added r1879156 to fix the eye bleed. - jailletc36: CHANGES could also be looked at if it makes sense to update the terminology - also here - - *) strict content-length parsing - trunk patch http://svn.apache.org/r1877954 - http://svn.apache.org/r1877955 - http://svn.apache.org/r1879369 - http://svn.apache.org/r1879373 - 2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-ap_parse_strict_length.patch - +1: ylavic, minfrin, jim - ylavic: the patch drops changes to apreq, which seems to not be in 2.4. - - *) mod_ssl: deduplicate some code - mod_ssl: Use temporary pool for variable lookup results which don't need to live in pconf - mod_ssl: Factor out code to read a BIO into a palloc'ed string - mod_ssl: Use <16 character cname argument for socache ->init() per the API constraint - trunk patch http://svn.apache.org/r1705539 - http://svn.apache.org/r1877263 - http://svn.apache.org/r1877291 - http://svn.apache.org/r1879445 - 2.4.x patch: svn merge -c 1705539,1877263,1877291,1879445 ^/httpd/httpd/trunk . - +1: jailletc36, minfrin, jim - - *) core: Fix a signed/unsigned comparison - trunk patch http://svn.apache.org/r1864868 - 2.4.x patch: svn merge -c 1864868 ^/httpd/httpd/trunk . - +1: jailletc36, minfrin, jim - *) "[mod_dav_fs etag handling] should really honor the FileETag setting". - It now does. - Add "Digest" to FileETag directive, allowing a strong ETag to be @@ -245,32 +268,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1879541 http://svn.apache.org/r1879548 2.4.x patch https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-etag2.patch - +1: minfrin, jm - - *) core: Drop an invalid Last-Modified header value coming - from a (F)CGI script instead of replacing it with Unix epoch. - Warn the users about Last-Modified header value replacements - and violations of the RFC. - trunk patch: http://svn.apache.org/r1748379 - http://svn.apache.org/r1750747 - http://svn.apache.org/r1750749 - http://svn.apache.org/r1750953 - http://svn.apache.org/r1751138 - http://svn.apache.org/r1751139 - http://svn.apache.org/r1751147 - http://svn.apache.org/r1757818 - http://svn.apache.org/r1879253 - http://svn.apache.org/r1879348 - 2.4.x: trunk patches work, final view: - http://home.apache.org/~elukey/httpd-2.4.x-core-last_modified_tz_logging.patch - svn merge -c 1748379,1750747,1750749,1750953,1751138,1751139,1751139,1757818,1879253,r1879348 ^/httpd/httpd/trunk . - The code has been tested with a simple PHP script returning different Last-Modified - headers (GMT now, GMT now Europe/Paris, GMT tomorrow, GMT yesterday, PST now). - +1: elukey, jorton, jim - jorton: +1 though I'd say log at WARN or INFO for the APR_BAD_DATE case - rather than "silently" (at normal log-level) dropping the parsed header? - [also nit: wrapping a lone ap_log_rerror(,APLOG_X) call in - if (APLOGrX(..) is unnecessary/redundant] + +1: minfrin, jim PATCHES/ISSUES THAT ARE BEING WORKED