Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[Stefan Eissing]

Ah, should read my inbox to the end. Thanks William for straightening this out.

-Stefan

> Am 09.06.2016 um 09:54 schrieb Stefan Eissing :
> 
> 
>> Am 08.06.2016 um 15:22 schrieb Jim Jagielski :
>> 
>>> It is just a remark that we should move forward and either backport 
>>> ap_cstr_casecmp[n] or decide to delay it to another release.
>> 
>> I'd really prefer that it be added to this release... But I also
>> know that there's some overlap w/ APR and that always causes
>> delays.
> 
> +1
> 
> This currently hurts when backporting. If we have a superior implementation, 
> let's add that to httpd now, phase over to apr_* when that is settled.
> 
> -Stefan
> 

Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[Stefan Eissing]

> Am 08.06.2016 um 15:22 schrieb Jim Jagielski :
> 
>> It is just a remark that we should move forward and either backport 
>> ap_cstr_casecmp[n] or decide to delay it to another release.
> 
> I'd really prefer that it be added to this release... But I also
> know that there's some overlap w/ APR and that always causes
> delays.

+1

This currently hurts when backporting. If we have a superior implementation, 
let's add that to httpd now, phase over to apr_* when that is settled.

-Stefan

Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[Jim Jagielski]

> It is just a remark that we should move forward and either backport 
> ap_cstr_casecmp[n] or decide to delay it to another release.

I'd really prefer that it be added to this release... But I also
know that there's some overlap w/ APR and that always causes
delays.

Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[William A Rowe Jr]

On Tue, Jun 7, 2016 at 1:23 AM, Marion & Christophe JAILLET <
christophe.jail...@wanadoo.fr> wrote:

> Le 07/06/2016 à 06:59, William A Rowe Jr a écrit :
>
> On Mon, Jun 6, 2016 at 3:10 PM, Marion & Christophe JAILLET <
> christophe.jail...@wanadoo.fr> wrote:
>
>> ap_casecmpstr breaks 2.4.x build.
>> Keep strncasecmp for now? (waiting for ap_cstr_casecmp[n])
>>
>> Le 06/06/2016 à 21:11, j...@apache.org a écrit :
>>
>>> Author: jim
>>> Date: Mon Jun  6 19:11:20 2016
>>> New Revision: 1747056
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1747056=rev
>>> Log:
>>> Merge r1744206 from trunk:
>>>
>>> mod_rewrite: adding h2:// and h2c:// proxy schemes to absolute uri
>>> detection, patch by Evgeny Kotkov
>>> Submitted by: icing
>>> Reviewed/backported by: jim
>>>
>>> Modified:
>>>  httpd/httpd/branches/2.4.x/   (props changed)
>>>  httpd/httpd/branches/2.4.x/STATUS
>>>  httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
>>>
>>>
>>> Modified: httpd/httpd/branches/2.4.x/STATUS
>>> URL:
>>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1747056=1747055=1747056=diff
>>>
>>> ==
>>> --- httpd/httpd/branches/2.4.x/STATUS (original)
>>> +++ httpd/httpd/branches/2.4.x/STATUS Mon Jun  6 19:11:20 2016
>>> @@ -115,12 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
>>> [ start all new proposals below, under PATCHES PROPOSED. ]
>>> - *) mod_rewrite: support new h2:// and h2c:// proxy url schemes in
>>> detection
>>> - of absolute urls:
>>> - trunk patch: http://svn.apache.org/r1744206
>>> - 2.4.x patch: trunk works
>>> - +1: icing, jim, covener
>>>
>>
> Well, contrary to the commit message that failed to credit to the two
> other
> reviewers, it did have 3 +1's... we are pretty specific on backport policy.
>
> Is that a vote against, jallettc? If not, the backport remains valid.
>
> No, it's not a vote against.
> It is just a remark that we should move forward and either backport
> ap_cstr_casecmp[n] or decide to delay it to another release.
>
> We are building 2.4.21, so breaking compilation for a few days is, IMHO,
> acceptable.
>

Agreed, I don't like a broken trunk or branch state, but it isn't
a major crisis.


> I will have limited time until end of the week to update my
> ap_cstr_casecmp[n] backport proposal.
> So if anyone wants to update it before, do not hesitate.
>

I'm happy to do so, but my preference is to favor the apr_cstr_casecmp[n]
as I detailed in my (too many times edited) original reply to the proposal.

I'll work this up in the coming hour, no worries about your schedule.

Cheers,

Bill

Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[Marion & Christophe JAILLET]

Le 07/06/2016 à 06:59, William A Rowe Jr a écrit :
On Mon, Jun 6, 2016 at 3:10 PM, Marion & Christophe JAILLET 
> 
wrote:


ap_casecmpstr breaks 2.4.x build.
Keep strncasecmp for now? (waiting for ap_cstr_casecmp[n])

Le 06/06/2016 à 21:11, j...@apache.org  a
écrit :

Author: jim
Date: Mon Jun  6 19:11:20 2016
New Revision: 1747056

URL: http://svn.apache.org/viewvc?rev=1747056=rev
Log:
Merge r1744206 from trunk:

mod_rewrite: adding h2:// and h2c:// proxy schemes to absolute
uri detection, patch by Evgeny Kotkov
Submitted by: icing
Reviewed/backported by: jim

Modified:
 httpd/httpd/branches/2.4.x/   (props changed)
 httpd/httpd/branches/2.4.x/STATUS
 httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c


Modified: httpd/httpd/branches/2.4.x/STATUS
URL:

http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1747056=1747055=1747056=diff

==
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun  6 19:11:20 2016
@@ -115,12 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- *) mod_rewrite: support new h2:// and h2c:// proxy url
schemes in detection
- of absolute urls:
- trunk patch: http://svn.apache.org/r1744206
- 2.4.x patch: trunk works
- +1: icing, jim, covener


Well, contrary to the commit message that failed to credit to the two 
other
reviewers, it did have 3 +1's... we are pretty specific on backport 
policy.


Is that a vote against, jallettc? If not, the backport remains valid.



No, it's not a vote against.
It is just a remark that we should move forward and either backport 
ap_cstr_casecmp[n] or decide to delay it to another release.


We are building 2.4.21, so breaking compilation for a few days is, IMHO, 
acceptable.



I will have limited time until end of the week to update my 
ap_cstr_casecmp[n] backport proposal.

So if anyone wants to update it before, do not hesitate.

CJ

Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[William A Rowe Jr]

On Mon, Jun 6, 2016 at 3:10 PM, Marion & Christophe JAILLET <
christophe.jail...@wanadoo.fr> wrote:

> ap_casecmpstr breaks 2.4.x build.
> Keep strncasecmp for now? (waiting for ap_cstr_casecmp[n])
>
> Le 06/06/2016 à 21:11, j...@apache.org a écrit :
>
>> Author: jim
>> Date: Mon Jun  6 19:11:20 2016
>> New Revision: 1747056
>>
>> URL: http://svn.apache.org/viewvc?rev=1747056=rev
>> Log:
>> Merge r1744206 from trunk:
>>
>> mod_rewrite: adding h2:// and h2c:// proxy schemes to absolute uri
>> detection, patch by Evgeny Kotkov
>> Submitted by: icing
>> Reviewed/backported by: jim
>>
>> Modified:
>>  httpd/httpd/branches/2.4.x/   (props changed)
>>  httpd/httpd/branches/2.4.x/STATUS
>>  httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
>>
>>
>> Modified: httpd/httpd/branches/2.4.x/STATUS
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1747056=1747055=1747056=diff
>>
>> ==
>> --- httpd/httpd/branches/2.4.x/STATUS (original)
>> +++ httpd/httpd/branches/2.4.x/STATUS Mon Jun  6 19:11:20 2016
>> @@ -115,12 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
>> [ start all new proposals below, under PATCHES PROPOSED. ]
>> - *) mod_rewrite: support new h2:// and h2c:// proxy url schemes in
>> detection
>> - of absolute urls:
>> - trunk patch: http://svn.apache.org/r1744206
>> - 2.4.x patch: trunk works
>> - +1: icing, jim, covener
>>
>
Well, contrary to the commit message that failed to credit to the two other
reviewers, it did have 3 +1's... we are pretty specific on backport policy.

Is that a vote against, jallettc? If not, the backport remains valid.

Re: svn commit: r1747056 - in /httpd/httpd/branches/2.4.x: ./ STATUS modules/mappers/mod_rewrite.c

[Marion & Christophe JAILLET]

ap_casecmpstr breaks 2.4.x build.
Keep strncasecmp for now? (waiting for ap_cstr_casecmp[n])

CJ


Le 06/06/2016 à 21:11, j...@apache.org a écrit :

Author: jim
Date: Mon Jun  6 19:11:20 2016
New Revision: 1747056

URL: http://svn.apache.org/viewvc?rev=1747056=rev
Log:
Merge r1744206 from trunk:

mod_rewrite: adding h2:// and h2c:// proxy schemes to absolute uri detection, 
patch by Evgeny Kotkov
Submitted by: icing
Reviewed/backported by: jim

Modified:
 httpd/httpd/branches/2.4.x/   (props changed)
 httpd/httpd/branches/2.4.x/STATUS
 httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c


Modified: httpd/httpd/branches/2.4.x/STATUS
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1747056=1747055=1747056=diff
==
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jun  6 19:11:20 2016
@@ -115,12 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
  
  
- *) mod_rewrite: support new h2:// and h2c:// proxy url schemes in detection

- of absolute urls:
- trunk patch: http://svn.apache.org/r1744206
- 2.4.x patch: trunk works
- +1: icing, jim, covener
-
*) Correct the behavior and interaction between SSLProxyCheckPeer[CN|Name],
   such that disabling either disables both, and that enabling either will
   trigger the more comprehensive SSLProxyCheckPeerName behavior.

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
URL: 
http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1747056=1747055=1747056=diff
==
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Mon Jun  6 
19:11:20 2016
@@ -560,6 +560,14 @@ static unsigned is_absolute_uri(char *ur
  *sqs = 1;
  return 8;
  }
+else if (!ap_casecmpstrn(uri, "2://", 4)) {/* h2:// */
+*sqs = 1;
+return 5;
+}
+else if (!ap_casecmpstrn(uri, "2c://", 5)) {   /* h2c://*/
+*sqs = 1;
+return 6;
+}
  break;
  
  case 'l':