You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2024/01/03 15:11:51 UTC

svn commit: r1915068 - /httpd/httpd/branches/2.4.x/STATUS

Author: jorton
Date: Wed Jan  3 15:11:51 2024
New Revision: 1915068

URL: http://svn.apache.org/viewvc?rev=1915068&view=rev
Log:
Updated after merged backports.

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=1915068&r1=1915067&r2=1915068&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Jan  3 15:11:51 2024
@@ -149,15 +149,20 @@ CURRENT RELEASE NOTES:
 
 RELEASE SHOWSTOPPERS:
 
-   *) mod_ssl: Fix typo in openssl-3 compat backported in r1913912 (impacting pkcs#11 engines)
-      trunk patch: http://svn.apache.org/r1914318
-      2.4.x patch: svn merge -c r1914318 ^/httpd/httpd/trunk .
-      +1: ylavic, minfrin, jorton
-
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
+   *) Add support for SHA-2 crypt() algorithm in htpasswd.
+      trunk patch: http://svn.apache.org/r1861793
+                   http://svn.apache.org/r1862612
+                   http://svn.apache.org/r1877251
+                   http://svn.apache.org/r1862724
+                   http://svn.apache.org/r1907672
+      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-htpasswd-SHA-2-crypt-2.patch
+      +1: minfrin, ylavic, jorton
+
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -210,15 +215,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-warnings-be-gone.patch
       +1: minfrin, ylavic
 
-   *) Add support for SHA-2 crypt() algorithm in htpasswd.
-      trunk patch: http://svn.apache.org/r1861793
-                   http://svn.apache.org/r1862612
-                   http://svn.apache.org/r1877251
-                   http://svn.apache.org/r1862724
-                   http://svn.apache.org/r1907672
-      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-htpasswd-SHA-2-crypt-2.patch
-      +1: minfrin, ylavic, jorton
-
    *) Add CGIScriptTimeout to mod_cgi.
       trunk patch: http://svn.apache.org/r1828172
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-add-CGIScriptTimeout.patch
@@ -230,12 +226,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-mod_env-override.patch
       +1: minfrin, ylavic
 
-   *) mod_xml2enc: tolerate libxml2 2.12.0
-        https://github.com/apache/httpd/pull/393
-      trunk patch: http://svn.apache.org/viewvc?rev=1914013
-      2.4.x patch: svn merge -c 1914013 ^/httpd/httpd/trunk .
-      +1: covener, minfrin, jorton
-
    *) mod_ldap: Add a hint to install the apr_ldap module on init failure.
       trunk patch: http://svn.apache.org/r1914038
       2.4.x patch: svn merge -c r1914038 ^/httpd/httpd/trunk .