You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2021/05/11 09:50:50 UTC
svn commit: r1889751 - /httpd/httpd/branches/2.4.x/STATUS
Author: rpluem
Date: Tue May 11 09:50:49 2021
New Revision: 1889751
URL: http://svn.apache.org/viewvc?rev=1889751&view=rev
Log:
* Vote and promote [skip ci]
Modified:
httpd/httpd/branches/2.4.x/STATUS
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1889751&r1=1889750&r2=1889751&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue May 11 09:50:49 2021
@@ -160,17 +160,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
svn merge -c 1889341 ^/httpd/httpd/trunk .
+1: rpluem, covener, ylavic
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
- [ New proposals should be added at the end of the list ]
-
- *) 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-functions2.patch
- +1: minfrin
- ylavic: patch is 404
-
*) core/mod_ssl/mod_md:
- adding new ap_ssl_*() functions for a backward
compatible replacement of the major optional mod_ssl functions. This
@@ -189,12 +178,23 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
r1888723, r1888724, r1888726, r1888729
PR: https://github.com/apache/httpd/pull/179
patch: https://github.com/apache/httpd/pull/179.diff
- +1: icing, ylavic
+ +1: icing, ylavic, rpluem
ylavic: some "<<<<<<< HEAD" hunk in ap_mmn.h should be remove on
backport..
jailletc36: pull/179 has been updated with r1889009
icing: fixed the merge garbage in ap_mmn.h. thanks Yann.
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+ [ New proposals should be added at the end of the list ]
+
+ *) 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-functions2.patch
+ +1: minfrin
+ ylavic: patch is 404
+
*) 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 .