You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2023/03/13 21:17:08 UTC
svn commit: r1908358 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/rewrite.t
Author: ylavic
Date: Mon Mar 13 21:17:08 2023
New Revision: 1908358
URL: http://svn.apache.org/viewvc?rev=1908358&view=rev
Log:
BNEG replaced by BNE= in mod_rewrite.
Modified:
httpd/test/framework/trunk/t/conf/extra.conf.in
httpd/test/framework/trunk/t/modules/rewrite.t
Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1908358&r1=1908357&r2=1908358&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Mon Mar 13 21:17:08 2023
@@ -272,8 +272,9 @@
RewriteRule ^/modules/rewrite/escaping/local/(.*) /?$1
RewriteRule ^/modules/rewrite/escaping/local_b/(.*) /?$1 [B]
RewriteRule ^/modules/rewrite/escaping/local_bctls/(.*) /?$1 [BCTLS]
+ RewriteRule ^/modules/rewrite/escaping/local_bctls_nospace/(.*) /?$1 "[BCTLS,BNE= ?]"
RewriteRule ^/modules/rewrite/escaping/local_bctls_andslash/(.*) /?$1 [B=/,BCTLS]
- RewriteRule ^/modules/rewrite/escaping/local_b_noslash/(.*) /?$1 [B=/,BNEG]
+ RewriteRule ^/modules/rewrite/escaping/local_b_noslash/(.*) /?$1 [B,BNE=/]
RewriteRule ^/modules/rewrite/escaping/local_b_justslash/(.*) /?$1 [B=/]
RewriteRule ^/modules/rewrite/escaping/redir/(.*) http://@SERVERNAME@:@PORT@/?$1 [R]
RewriteRule ^/modules/rewrite/escaping/redir_ne/(.*) http://@SERVERNAME@:@PORT@/?$1 [R,NE]
Modified: httpd/test/framework/trunk/t/modules/rewrite.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/modules/rewrite.t?rev=1908358&r1=1908357&r2=1908358&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/modules/rewrite.t (original)
+++ httpd/test/framework/trunk/t/modules/rewrite.t Mon Mar 13 21:17:08 2023
@@ -38,6 +38,7 @@ my @bflags = (
# t/conf/extra.conf.in
[ "/modules/rewrite/escaping/local_b/foo/bar/%20baz%0d" => "foo%2fbar%2f+baz%0d"], # this is why [B] sucks
[ "/modules/rewrite/escaping/local_bctls/foo/bar/%20baz/%0d" => "foo/bar/+baz/%0d"], # spaces and ctls only
+ [ "/modules/rewrite/escaping/local_bctls_nospace/foo/bar/%20baz/%0d" => "foo/bar/ baz/%0d"], # ctls but not space
[ "/modules/rewrite/escaping/local_bctls_andslash/foo/bar/%20baz/%0d" => "foo%2fbar%2f+baz%2f%0d"], # not realistic, but opt in to slashes
[ "/modules/rewrite/escaping/local_b_noslash/foo/bar/%20baz/%0d" => "foo/bar/+baz/%0d"], # negate something from [B]
[ "/modules/rewrite/escaping/local_b_justslash/foo/bar/%20baz/" => "foo%2fbar%2f baz%2f"], # test basic B=/
Re: svn commit: r1908358 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/rewrite.t
Posted by Ruediger Pluem <rp...@apache.org>.
On 3/14/23 10:32 AM, Yann Ylavic wrote:
> On Tue, Mar 14, 2023 at 10:14 AM Ruediger Pluem <rp...@apache.org> wrote:
>>
>> On 3/14/23 10:06 AM, Yann Ylavic wrote:
>>> On Tue, Mar 14, 2023 at 9:21 AM Ruediger Pluem <rp...@apache.org> wrote:
>>>>
>>>>
>>>> On 3/13/23 10:17 PM, ylavic@apache.org wrote:
>>>>> Author: ylavic
>>>>> Date: Mon Mar 13 21:17:08 2023
>>>>> New Revision: 1908358
>>>>>
>>>>> URL: http://svn.apache.org/viewvc?rev=1908358&view=rev
>>>>> Log:
>>>>> BNEG replaced by BNE= in mod_rewrite.
>>>>>
>>>>> Modified:
>>>>> httpd/test/framework/trunk/t/conf/extra.conf.in
>>>>> httpd/test/framework/trunk/t/modules/rewrite.t
>>>>
>>>> Currently the test suite fails on the 2.4.x branch as the new rewrite flags are not known and two
>>>> further tests fail as the behavior in trunk and 2.4.x is different.
>>>> Do we want to fix rewrite.t such that it differs the tests more by version (2.4.57 / 2.5.1) or do
>>>> we want to propose the new rewrite flags for backport quickly such that these failures will go away soon.
>>>
>>> r1908374.
>>
>> That answers my question :-). Unfortunately there is another test with the BCTLS flag. Plus
>>
>> [ "/modules/rewrite/escaping/redir/foo%20bar" => 302],
>> [ "/modules/rewrite/escaping/fixups/redir/foo%20bar" => 302],
>>
>> deliver a 403 in 2.4.x.
>
> Hopefully I got everything right in r1908375 and r1908377 ;)
Looks good. Thanks.
Regards
Rüdiger
Re: svn commit: r1908358 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/rewrite.t
Posted by Yann Ylavic <yl...@gmail.com>.
On Tue, Mar 14, 2023 at 10:14 AM Ruediger Pluem <rp...@apache.org> wrote:
>
> On 3/14/23 10:06 AM, Yann Ylavic wrote:
> > On Tue, Mar 14, 2023 at 9:21 AM Ruediger Pluem <rp...@apache.org> wrote:
> >>
> >>
> >> On 3/13/23 10:17 PM, ylavic@apache.org wrote:
> >>> Author: ylavic
> >>> Date: Mon Mar 13 21:17:08 2023
> >>> New Revision: 1908358
> >>>
> >>> URL: http://svn.apache.org/viewvc?rev=1908358&view=rev
> >>> Log:
> >>> BNEG replaced by BNE= in mod_rewrite.
> >>>
> >>> Modified:
> >>> httpd/test/framework/trunk/t/conf/extra.conf.in
> >>> httpd/test/framework/trunk/t/modules/rewrite.t
> >>
> >> Currently the test suite fails on the 2.4.x branch as the new rewrite flags are not known and two
> >> further tests fail as the behavior in trunk and 2.4.x is different.
> >> Do we want to fix rewrite.t such that it differs the tests more by version (2.4.57 / 2.5.1) or do
> >> we want to propose the new rewrite flags for backport quickly such that these failures will go away soon.
> >
> > r1908374.
>
> That answers my question :-). Unfortunately there is another test with the BCTLS flag. Plus
>
> [ "/modules/rewrite/escaping/redir/foo%20bar" => 302],
> [ "/modules/rewrite/escaping/fixups/redir/foo%20bar" => 302],
>
> deliver a 403 in 2.4.x.
Hopefully I got everything right in r1908375 and r1908377 ;)
Regards;
Yann.
Re: svn commit: r1908358 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/rewrite.t
Posted by Ruediger Pluem <rp...@apache.org>.
On 3/14/23 10:06 AM, Yann Ylavic wrote:
> On Tue, Mar 14, 2023 at 9:21 AM Ruediger Pluem <rp...@apache.org> wrote:
>>
>>
>> On 3/13/23 10:17 PM, ylavic@apache.org wrote:
>>> Author: ylavic
>>> Date: Mon Mar 13 21:17:08 2023
>>> New Revision: 1908358
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1908358&view=rev
>>> Log:
>>> BNEG replaced by BNE= in mod_rewrite.
>>>
>>> Modified:
>>> httpd/test/framework/trunk/t/conf/extra.conf.in
>>> httpd/test/framework/trunk/t/modules/rewrite.t
>>
>> Currently the test suite fails on the 2.4.x branch as the new rewrite flags are not known and two
>> further tests fail as the behavior in trunk and 2.4.x is different.
>> Do we want to fix rewrite.t such that it differs the tests more by version (2.4.57 / 2.5.1) or do
>> we want to propose the new rewrite flags for backport quickly such that these failures will go away soon.
>
> r1908374.
That answers my question :-). Unfortunately there is another test with the BCTLS flag. Plus
[ "/modules/rewrite/escaping/redir/foo%20bar" => 302],
[ "/modules/rewrite/escaping/fixups/redir/foo%20bar" => 302],
deliver a 403 in 2.4.x.
Regards
Rüdiger
Re: svn commit: r1908358 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/rewrite.t
Posted by Yann Ylavic <yl...@gmail.com>.
On Tue, Mar 14, 2023 at 9:21 AM Ruediger Pluem <rp...@apache.org> wrote:
>
>
> On 3/13/23 10:17 PM, ylavic@apache.org wrote:
> > Author: ylavic
> > Date: Mon Mar 13 21:17:08 2023
> > New Revision: 1908358
> >
> > URL: http://svn.apache.org/viewvc?rev=1908358&view=rev
> > Log:
> > BNEG replaced by BNE= in mod_rewrite.
> >
> > Modified:
> > httpd/test/framework/trunk/t/conf/extra.conf.in
> > httpd/test/framework/trunk/t/modules/rewrite.t
>
> Currently the test suite fails on the 2.4.x branch as the new rewrite flags are not known and two
> further tests fail as the behavior in trunk and 2.4.x is different.
> Do we want to fix rewrite.t such that it differs the tests more by version (2.4.57 / 2.5.1) or do
> we want to propose the new rewrite flags for backport quickly such that these failures will go away soon.
r1908374.
Regards;
Yann.
Re: svn commit: r1908358 - in /httpd/test/framework/trunk/t: conf/extra.conf.in modules/rewrite.t
Posted by Ruediger Pluem <rp...@apache.org>.
On 3/13/23 10:17 PM, ylavic@apache.org wrote:
> Author: ylavic
> Date: Mon Mar 13 21:17:08 2023
> New Revision: 1908358
>
> URL: http://svn.apache.org/viewvc?rev=1908358&view=rev
> Log:
> BNEG replaced by BNE= in mod_rewrite.
>
> Modified:
> httpd/test/framework/trunk/t/conf/extra.conf.in
> httpd/test/framework/trunk/t/modules/rewrite.t
Currently the test suite fails on the 2.4.x branch as the new rewrite flags are not known and two
further tests fail as the behavior in trunk and 2.4.x is different.
Do we want to fix rewrite.t such that it differs the tests more by version (2.4.57 / 2.5.1) or do
we want to propose the new rewrite flags for backport quickly such that these failures will go away soon.
Regards
Rüdiger