I would be fine if we add:

1918814
1918815
1918823

Unfortunately they cause some conflicts:

modules/dav/main/ms_wdv.c
modules/filters/mod_crypto.c

are not present in 2.4.x an can just be ignored.
The patch to modules/http/byterange_filter.c needs to be slightly modified to:

Index: modules/http/byterange_filter.c
===================================================================
--- modules/http/byterange_filter.c     (revision 1918813)
+++ modules/http/byterange_filter.c     (working copy)
@@ -503,10 +503,10 @@
         /* Is ap_make_content_type required here? */
         const char *orig_ct = ap_make_content_type(r, r->content_type);

-        ap_set_content_type(r, apr_pstrcat(r->pool, "multipart",
+        ap_set_content_type_ex(r, apr_pstrcat(r->pool, "multipart",
                                            use_range_x(r) ? "/x-" : "/",
                                            "byteranges; boundary=",
-                                           ap_multipart_boundary, NULL));
+                                           ap_multipart_boundary, NULL), 1);

         if (orig_ct) {
             bound_head = apr_pstrcat(r->pool,



Regards

Rüdiger

On 7/2/24 1:02 PM, Eric Covener wrote:
> Looking for a third to do a quick followup release.
> 
> On Mon, Jul 1, 2024 at 5:19 PM <yla...@apache.org> wrote:
>>
>> Author: ylavic
>> Date: Mon Jul  1 21:19:05 2024
>> New Revision: 1918798
>>
>> URL: http://svn.apache.org/viewvc?rev=1918798&view=rev
>> Log:
>> Vote
>>
>> 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=1918798&r1=1918797&r2=1918798&view=diff
>> ==============================================================================
>> --- httpd/httpd/branches/2.4.x/STATUS (original)
>> +++ httpd/httpd/branches/2.4.x/STATUS Mon Jul  1 21:19:05 2024
>> @@ -154,7 +154,7 @@ RELEASE SHOWSTOPPERS:
>>    *) maintain ct trusted flag across ap_internal_fast_redirect
>>       Trunk version of patch: https://svn.apache.org/r1918795.
>>       2.4.x patch:  svn merge -c 1918795 ^/httpd/httpd/trunk .
>> -     +1 covener
>> +     +1 covener, ylavic
>>
>>  PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
>>    [ start all new proposals below, under PATCHES PROPOSED. ]
>>
>>
> 
> 

Reply via email to