On 2/1/22 1:23 AM, Yann Ylavic wrote:
> On Mon, Jan 31, 2022 at 10:10 AM Ruediger Pluem <rpl...@apache.org> wrote:
>>
>> BTW: Backporting r1897460 and r1897472 for child.c of the Windows MPM needs
>> some close look as a number of changes
>> to child.c in trunk have not been backported yet:
>
> The gap is too big (for me) between the winnt MPMs on trunk and 2.4.x
> for backporting r1897460 and r1897472 easily.
> What I did in https://github.com/apache/httpd/pull/289 is to use
> ap_thread_current_create() directly in the worker_main() thread, it's
> simple, but it does not even compile because
> ap_thread_current_create() is not AP_DECLARE/exported anymore, it's
> been replaced by ap_thread_main_create() in the latest commits of the
> series (since it's how it's used everywhere else).
> So we could AP_DECLARE ap_thread_current_create() specifically for
> 2.4.x, or disable thread locals for pcre2 on Windows, or someone will
> have to propose a more complete backport with the below list first:
>
>> 1801146
>> 1801147
>> 1801635
>> 1801636
>> 1801637
>> 1801639
>> 1801640
>> 1801655
>> 1801656
>> 1801657
>> 1801710
>> 1801747
>> 1801748
>> 1801749
>> 1801753
I have done a quick check and they merge just fine (minus a log-message-tags
conflict) from
a text perspective. But I have not the expertise to review these change nor can
I compile
these. But I am happy to create a PR in Github if someone can review and
compile this.
Regards
Rüdiger
