From 71b47d3b9a5f81658b33f509593c42f11c2f6b67 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 20 Aug 2021 10:13:54 +0000 Subject: [PATCH] Vote, promote [skip ci]. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1892469 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/STATUS b/STATUS index 152cb5f8507..f718a551e17 100644 --- a/STATUS +++ b/STATUS @@ -175,34 +175,21 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: *) core: fix ap_escape_quotes substitution logic trunk patch: https://svn.apache.org/r1892418 2.4.x patch: svn merge -c 1892418 ^/httpd/httpd/trunk . - +1: covener, rpluem - -PATCHES PROPOSED TO BACKPORT FROM TRUNK: - [ New proposals should be added at the end of the list ] - - *) mod_xml2enc: Correctly handle Microsoft OOXML documents. PR 64339 - trunk patch: http://svn.apache.org/r1884505 - 2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk . - +1: - jailletc36: there has been some discussion about how to fix the issue. - I'm not sure that the commit above is the best solution - and other alternatives have been discussed in PR 64339. If r1884505 - is not the right fix, then it should be removed from trunk. - Putting it here is a way to revive the discussion + +1: covener, rpluem, ylavic *) Add dav_get_provider(), dav_open_lockdb(), dav_close_lockdb() and dav_get_resource() to mod_dav.h. trunk patch: http://svn.apache.org/r1879305 http://svn.apache.org/r1879466 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-functions6.patch - +1: minfrin, jim + +1: minfrin, jim, ylavic (by inspection) *) Add hooks deliver_report and gather_reports to mod_dav.h. Allows other modules apart from versioning implementations to handle the REPORT method. trunk patch: http://svn.apache.org/r1879339 http://svn.apache.org/r1879307 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-hooks1.patch - +1: minfrin, jim + +1: minfrin, jim, ylavic (by inspection) *) mod_dav: Add method_precondition hook. WebDAV extensions define conditions that must exist before a WebDAV method can be executed. @@ -210,7 +197,21 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1879339 http://svn.apache.org/r1879340 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-dav-preconditions1.patch - +1: minfrin, jim + +1: minfrin, jim, ylavic (by inspection) + ylavic: requires above httpd-2.4-dav-hooks1.patch first. + +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + [ New proposals should be added at the end of the list ] + + *) mod_xml2enc: Correctly handle Microsoft OOXML documents. PR 64339 + trunk patch: http://svn.apache.org/r1884505 + 2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk . + +1: + jailletc36: there has been some discussion about how to fix the issue. + I'm not sure that the commit above is the best solution + and other alternatives have been discussed in PR 64339. If r1884505 + is not the right fix, then it should be removed from trunk. + Putting it here is a way to revive the discussion *) back port: new ap_ssl_bind_outgoing for multi ssl support in proxy connections core/mod_proxy/mod_ssl: @@ -251,7 +252,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1887359 http://svn.apache.org/r1887144 Backport version for 2.4.x of patch: - https://people.apache.org/~jfclere/patches/patch.210810..txt + https://people.apache.org/~jfclere/patches/patch.210810.txt +1: jfclere, jim jfclere: The previous proposal was removing the Referer check. jorton: r1859235 has an "ok2change" param in the newly added -- 2.47.2