You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2022/02/18 13:14:13 UTC
svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Author: covener
Date: Fri Feb 18 13:14:13 2022
New Revision: 1898181
URL: http://svn.apache.org/viewvc?rev=1898181&view=rev
Log:
vote/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=1898181&r1=1898180&r2=1898181&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Feb 18 13:14:13 2022
@@ -179,6 +179,52 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
Proposed for backport below, in place of or after this one.
rpluem: +1 on PR 289 as well.
+ *) Support PCRE2 with buffers reuse through Thread Local Storage.
+ trunk patches:
+ http://svn.apache.org/r1897240
+ http://svn.apache.org/r1897241
+ http://svn.apache.org/r1897242
+ http://svn.apache.org/r1897244
+ http://svn.apache.org/r1897248
+ http://svn.apache.org/r1897250
+ http://svn.apache.org/r1897260
+ http://svn.apache.org/r1897261
+ http://svn.apache.org/r1897263
+ http://svn.apache.org/r1897386
+ http://svn.apache.org/r1897459
+ http://svn.apache.org/r1897460
+ http://svn.apache.org/r1897461
+ http://svn.apache.org/r1897462
+ http://svn.apache.org/r1897472
+ http://svn.apache.org/r1897543
+ http://svn.apache.org/r1612934
+ http://svn.apache.org/r1612940
+ http://svn.apache.org/r1613189
+ http://svn.apache.org/r1897651
+ http://svn.apache.org/r1897680
+ http://svn.apache.org/r1897689
+ http://svn.apache.org/r1897691
+ http://svn.apache.org/r1897692
+ 2.4.x patches:
+ https://github.com/apache/httpd/pull/289.diff
+ (PR: https://github.com/apache/httpd/pull/289)
+ +1: ylavic, rpluem, covener
+ ylavic: This backport proposal inludes the PCRE2 backport already accepted,
+ we can apply this one instead or the original one first and then
+ this one (I'd have to rebase the github PR first).
+ ylavic: Can someone test this on Windows too?
+
+
+ *) Add the ldap function to the expression API, allowing LDAP filters and
+ distinguished names based on expressions to be escaped correctly to
+ guard against LDAP injection.
+ Trunk version of patch:
+ https://svn.apache.org/r1589986
+ https://svn.apache.org/r1589995
+ https://svn.apache.org/r1633528
+ Backport version for 2.4.x of patch:
+ https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-expr.patch
+ +1: minfrin, icing, covener
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
@@ -194,17 +240,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
jailletc36: part of r1891023 is needed to fill some APLOGNO()
icing: seems there is some potential to wrap this into a common function?
- *) Add the ldap function to the expression API, allowing LDAP filters and
- distinguished names based on expressions to be escaped correctly to
- guard against LDAP injection.
- Trunk version of patch:
- https://svn.apache.org/r1589986
- https://svn.apache.org/r1589995
- https://svn.apache.org/r1633528
- Backport version for 2.4.x of patch:
- https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ldap-expr.patch
- +1: minfrin, icing
-
*) Add the ldap-search option to mod_authnz_ldap, allowing authorization
to be based on arbitrary expressions that do not include the username.
Make sure that when ldap searches are too long, we explicitly log the
@@ -226,41 +261,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
+1: minfrin
- *) Support PCRE2 with buffers reuse through Thread Local Storage.
- trunk patches:
- http://svn.apache.org/r1897240
- http://svn.apache.org/r1897241
- http://svn.apache.org/r1897242
- http://svn.apache.org/r1897244
- http://svn.apache.org/r1897248
- http://svn.apache.org/r1897250
- http://svn.apache.org/r1897260
- http://svn.apache.org/r1897261
- http://svn.apache.org/r1897263
- http://svn.apache.org/r1897386
- http://svn.apache.org/r1897459
- http://svn.apache.org/r1897460
- http://svn.apache.org/r1897461
- http://svn.apache.org/r1897462
- http://svn.apache.org/r1897472
- http://svn.apache.org/r1897543
- http://svn.apache.org/r1612934
- http://svn.apache.org/r1612940
- http://svn.apache.org/r1613189
- http://svn.apache.org/r1897651
- http://svn.apache.org/r1897680
- http://svn.apache.org/r1897689
- http://svn.apache.org/r1897691
- http://svn.apache.org/r1897692
- 2.4.x patches:
- https://github.com/apache/httpd/pull/289.diff
- (PR: https://github.com/apache/httpd/pull/289)
- +1: ylavic, rpluem,
- ylavic: This backport proposal inludes the PCRE2 backport already accepted,
- we can apply this one instead or the original one first and then
- this one (I'd have to rebase the github PR first).
- ylavic: Can someone test this on Windows too?
-
*) mod_proxy: Bump shared worker name to 384 chars. PR 53218
trunk patch: http://svn.apache.org/r1896253
http://svn.apache.org/r1897859 (CHANGES entry, not in patch)
Re: svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Posted by SteffenAL <in...@apachelounge.com>.
Build and running with PCRE2 10.39, for now only win64, win32 later.
All looks fine.
Also third-party modules (like mod_security) that are build with PCRE,
just leave pcre.dll in bin.
ModSecurity: PCRE compiled version="8.45 "; loaded version="8.45
2021-06-15"
mod_info:
Apache Lounge VS16 Server built: Feb 21 2022 10:23:16
Server loaded APR Version: 1.7.0
Compiled with APR Version: 1.7.0
Server loaded APU Version: 1.6.1
Compiled with APU Version: 1.6.1
Server loaded PCRE Version: 10.39 2021-10-29
Compiled with PCRE Version: 10.39 2021-10-29
Server Architecture: 64-bit
On Monday 21/02/2022 at 08:57, Ruediger Pluem wrote:
> Thanks, can you also check if PCRE2 works, e.g. PCRE2 10.39 which
> seems to be the latest version?
>
> Regards
>
> Rüdiger
>
> On 2/20/22 1:53 PM, SteffenAL wrote:
>>
>> All looks good on Win32 and Win64
>>
>> Build with today's https://github.com/ylavic/httpd/tree/pcre2_tls
>>
>> and dependencies:
>>
>> - pcre 8.45
>> - openssl 1.1.1m
>> - nghttp2 1.46.0
>> - jansson 2.14
>> - curl 7.80.1
>> - apr 1.7.0
>> - apr-util 1.6.1
>> - apr-iconv 1.2.2
>> - zlib 1.2.11
>> - brotli 1.0.9
>> - libxml2 2.9.12
>> - lua 5.2.4
>> - expat 2.4.1
>>
>>
>> On Saturday 19/02/2022 at 17:58, Steffen Land wrote:
>>>
>>> Yep,
>>>
>>> next week I try PCRE 8.45 with the branche at
>>>
>>> https://github.com/ylavic/httpd/tree/pcre2_tls
>>> <https://github.com/ylavic/httpd/tree/pcre2_tls >
>>>
>>>
>>>
>>>
>>> On Friday 18/02/2022 at 14:16, Eric Covener wrote:
>>>
>>> @Steffen Land any chance you can test the pcre8 update on
>>> Windows
>>> prior to integration in 2.4.x?
>>>
>>> + https://github.com/apache/httpd/pull/289.diff
>>> + (PR: https://github.com/apache/httpd/pull/289)
>>> + +1: ylavic, rpluem, covener
>>> + ylavic: This backport proposal inludes the PCRE2
>>> backport already accepted,
>>> + we can apply this one instead or the original one
>>> first and then
>>> + this one (I'd have to rebase the github PR first).
>>> + ylavic: Can someone test this on Windows too?
>>>
>>>
>>
Re: svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Ruediger Pluem <rp...@apache.org>.
Thanks, can you also check if PCRE2 works, e.g. PCRE2 10.39 which seems to be the latest version?
Regards
Rüdiger
On 2/20/22 1:53 PM, SteffenAL wrote:
> All looks good on Win32 and Win64
>
> Build with today's https://github.com/ylavic/httpd/tree/pcre2_tls
>
> and dependencies:
>
> - pcre 8.45
> - openssl 1.1.1m
> - nghttp2 1.46.0
> - jansson 2.14
> - curl 7.80.1
> - apr 1.7.0
> - apr-util 1.6.1
> - apr-iconv 1.2.2
> - zlib 1.2.11
> - brotli 1.0.9
> - libxml2 2.9.12
> - lua 5.2.4
> - expat 2.4.1
>
>
> On Saturday 19/02/2022 at 17:58, Steffen Land wrote:
>> Yep,
>>
>> next week I try PCRE 8.45 with the branche at
>>
>> https://github.com/ylavic/httpd/tree/pcre2_tls <https://github.com/ylavic/httpd/tree/pcre2_tls >
>>
>>
>>
>>
>> On Friday 18/02/2022 at 14:16, Eric Covener wrote:
>>
>> @Steffen Land any chance you can test the pcre8 update on Windows
>> prior to integration in 2.4.x?
>>
>> + https://github.com/apache/httpd/pull/289.diff
>> + (PR: https://github.com/apache/httpd/pull/289)
>> + +1: ylavic, rpluem, covener
>> + ylavic: This backport proposal inludes the PCRE2 backport already accepted,
>> + we can apply this one instead or the original one first and then
>> + this one (I'd have to rebase the github PR first).
>> + ylavic: Can someone test this on Windows too?
>>
>>
>
Re: svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Posted by SteffenAL <in...@apachelounge.com>.
All looks good on Win32 and Win64
Build with today's https://github.com/ylavic/httpd/tree/pcre2_tls
and dependencies:
- pcre 8.45
- openssl 1.1.1m
- nghttp2 1.46.0
- jansson 2.14
- curl 7.80.1
- apr 1.7.0
- apr-util 1.6.1
- apr-iconv 1.2.2
- zlib 1.2.11
- brotli 1.0.9
- libxml2 2.9.12
- lua 5.2.4
- expat 2.4.1
On Saturday 19/02/2022 at 17:58, Steffen Land wrote:
>
>
>
> Yep,
>
> next week I try PCRE 8.45 with the branche at
>
>
> https://github.com/ylavic/httpd/tree/pcre2_tls
>
>
>
>
>
>
> On Friday 18/02/2022 at 14:16, Eric Covener wrote:
>> @Steffen Land any chance you can test the pcre8 update on Windows
>> prior to integration in 2.4.x?
>>
>>>
>>> + https://github.com/apache/httpd/pull/289.diff
>>> + (PR: https://github.com/apache/httpd/pull/289)
>>> + +1: ylavic, rpluem, covener
>>> + ylavic: This backport proposal inludes the PCRE2 backport
>>> already accepted,
>>> + we can apply this one instead or the original one first
>>> and then
>>> + this one (I'd have to rebase the github PR first).
>>> + ylavic: Can someone test this on Windows too?
>
Re: svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Steffen Land <in...@apachelounge.com>.
Yep,
next week I try PCRE 8.45 with the branche at
https://github.com/ylavic/httpd/tree/pcre2_tls
On Friday 18/02/2022 at 14:16, Eric Covener wrote:
> @Steffen Land any chance you can test the pcre8 update on Windows
> prior to integration in 2.4.x?
>
>>
>> + https://github.com/apache/httpd/pull/289.diff
>> + (PR: https://github.com/apache/httpd/pull/289)
>> + +1: ylavic, rpluem, covener
>> + ylavic: This backport proposal inludes the PCRE2 backport
>> already accepted,
>> + we can apply this one instead or the original one first
>> and then
>> + this one (I'd have to rebase the github PR first).
>> + ylavic: Can someone test this on Windows too?
Re: svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Eric Covener <co...@gmail.com>.
@Steffen Land any chance you can test the pcre8 update on Windows
prior to integration in 2.4.x?
> + https://github.com/apache/httpd/pull/289.diff
> + (PR: https://github.com/apache/httpd/pull/289)
> + +1: ylavic, rpluem, covener
> + ylavic: This backport proposal inludes the PCRE2 backport already accepted,
> + we can apply this one instead or the original one first and then
> + this one (I'd have to rebase the github PR first).
> + ylavic: Can someone test this on Windows too?
Re: svn commit: r1898181 - /httpd/httpd/branches/2.4.x/STATUS
Posted by Yann Ylavic <yl...@gmail.com>.
On Fri, Feb 18, 2022 at 2:14 PM <co...@apache.org> wrote:
>
> Author: covener
> Date: Fri Feb 18 13:14:13 2022
> New Revision: 1898181
>
> URL: http://svn.apache.org/viewvc?rev=1898181&view=rev
> Log:
> vote/promote
>
> + *) Support PCRE2 with buffers reuse through Thread Local Storage.
> + trunk patches:
> + http://svn.apache.org/r1897240
> + http://svn.apache.org/r1897241
> + http://svn.apache.org/r1897242
> + http://svn.apache.org/r1897244
> + http://svn.apache.org/r1897248
> + http://svn.apache.org/r1897250
> + http://svn.apache.org/r1897260
> + http://svn.apache.org/r1897261
> + http://svn.apache.org/r1897263
> + http://svn.apache.org/r1897386
> + http://svn.apache.org/r1897459
> + http://svn.apache.org/r1897460
> + http://svn.apache.org/r1897461
> + http://svn.apache.org/r1897462
> + http://svn.apache.org/r1897472
> + http://svn.apache.org/r1897543
> + http://svn.apache.org/r1612934
> + http://svn.apache.org/r1612940
> + http://svn.apache.org/r1613189
> + http://svn.apache.org/r1897651
> + http://svn.apache.org/r1897680
> + http://svn.apache.org/r1897689
> + http://svn.apache.org/r1897691
> + http://svn.apache.org/r1897692
> + 2.4.x patches:
> + https://github.com/apache/httpd/pull/289.diff
> + (PR: https://github.com/apache/httpd/pull/289)
> + +1: ylavic, rpluem, covener
> + ylavic: This backport proposal inludes the PCRE2 backport already accepted,
> + we can apply this one instead or the original one first and then
> + this one (I'd have to rebase the github PR first).
> + ylavic: Can someone test this on Windows too?
Re-reading the Windows changes I think I missed this hunk:
https://github.com/apache/httpd/compare/603013973a7e16188ad62d0b98f3935ce2448b24..b46b8734d738301e56587635fef4570ead869119
otherwise !AP_HAS_THREAD_LOCAL wouldn't work as expected there on Windows.
Now updated in PR 289.
Regards;
Yann.