Author: ylavic
Date: Thu Feb 22 13:45:08 2024
New Revision: 1915948
URL: http://svn.apache.org/viewvc?rev=1915948&view=rev
Log:
Accepted.
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=1915948&r1=1915947&r2=1915948&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Feb 22 13:45:08 2024
@@ -165,6 +165,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise
+1 from me on the backport.
+ *) mod_ssl: follow-up to r1825120 to simplify code (no functional change)
+ trunk patch: https://svn.apache.org/r1825124
+ 2.4.x patch: svn merge -c 1825124 ^/httpd/httpd/trunk .
+ Github PR: https://github.com/apache/httpd/pull/412
+ +1: jorton, ylavic, jfclere
+
+ *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59)
+ trunk patch: https://svn.apache.org/r1915889
+ 2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch
+ Github PR: https://github.com/apache/httpd/pull/413
+ +1: ylavic, jorton, jfclere
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[. New proposals should be added at the end of the list ]
@@ -231,18 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Github PR: https://github.com/apache/httpd/pull/410
+1: jorton, ylavic,
- *) mod_ssl: follow-up to r1825120 to simplify code (no functional change)
- trunk patch: https://svn.apache.org/r1825124
- 2.4.x patch: svn merge -c 1825124 ^/httpd/httpd/trunk .
- Github PR: https://github.com/apache/httpd/pull/412
- +1: jorton, ylavic, jfclere
-
- *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59)
- trunk patch: https://svn.apache.org/r1915889
- 2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch
- Github PR: https://github.com/apache/httpd/pull/413
- +1: ylavic, jorton, jfclere
-
*) htpasswd: Windows : do not include ap_config_auto.h
trunk patch: https://svn.apache.org/r1877693
2.4.x patch: svn merge -c 1877693 ^/httpd/httpd/trunk .
Date: Thu Feb 22 13:45:08 2024
New Revision: 1915948
URL: http://svn.apache.org/viewvc?rev=1915948&view=rev
Log:
Accepted.
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=1915948&r1=1915947&r2=1915948&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Feb 22 13:45:08 2024
@@ -165,6 +165,18 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
rpluem says: This has conflict in modules/http2/h2_version.h. Otherwise
+1 from me on the backport.
+ *) mod_ssl: follow-up to r1825120 to simplify code (no functional change)
+ trunk patch: https://svn.apache.org/r1825124
+ 2.4.x patch: svn merge -c 1825124 ^/httpd/httpd/trunk .
+ Github PR: https://github.com/apache/httpd/pull/412
+ +1: jorton, ylavic, jfclere
+
+ *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59)
+ trunk patch: https://svn.apache.org/r1915889
+ 2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch
+ Github PR: https://github.com/apache/httpd/pull/413
+ +1: ylavic, jorton, jfclere
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[. New proposals should be added at the end of the list ]
@@ -231,18 +243,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Github PR: https://github.com/apache/httpd/pull/410
+1: jorton, ylavic,
- *) mod_ssl: follow-up to r1825120 to simplify code (no functional change)
- trunk patch: https://svn.apache.org/r1825124
- 2.4.x patch: svn merge -c 1825124 ^/httpd/httpd/trunk .
- Github PR: https://github.com/apache/httpd/pull/412
- +1: jorton, ylavic, jfclere
-
- *) mod_ssl: fix build with !MODSSL_HAVE_ENGINE_API (follow up to r1913912 in 2.4.59)
- trunk patch: https://svn.apache.org/r1915889
- 2.4.x patch: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/413.patch
- Github PR: https://github.com/apache/httpd/pull/413
- +1: ylavic, jorton, jfclere
-
*) htpasswd: Windows : do not include ap_config_auto.h
trunk patch: https://svn.apache.org/r1877693
2.4.x patch: svn merge -c 1877693 ^/httpd/httpd/trunk .