Re: svn commit: r1747027 - /httpd/httpd/branches/2.4.x/STATUS

2016-06-06 Thread William A Rowe Jr
It seems the most critical point of my earlier post was missed...

On Mon, Jun 6, 2016 at 10:08 AM,  wrote:

> Author: wrowe
> Date: Mon Jun  6 15:08:01 2016
> New Revision: 1747027
>
> URL: http://svn.apache.org/viewvc?rev=1747027=rev
> Log:
> Showstopper to patch adoption, along with a more general objection
>
> 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=1747027=1747026=1747027=diff
>
> ==
> --- httpd/httpd/branches/2.4.x/STATUS (original)
> +++ httpd/httpd/branches/2.4.x/STATUS Mon Jun  6 15:08:01 2016
> @@ -203,7 +203,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
>   2.4.x patch:
> http://home.apache.org/~jailletc36/apr_cstr_casecmp_v2.diff
>   jailletc36: v2: update as per discussion on dev@. Do not mix ap_
> and apr_
>   namespaces + tweak DOXYGEN comments.
> - +1: jailletc36, icing
> + +1: jailletc36, icing
> + -0: wrowe [Prefer that we pre-@deprecate this API and encourage
> users
> +to adopt the apr_ convention, reversing the #defines,
> being
> +ready for the httpd 2.next minor release.]
> + -1: wrowe [Notes this patch creates binary incompatible versions of
> httpd
> +with this change; there must be #else stubs in util.c
> sources
> +compiled against APR 1.6+ for binary compatibility, even
> if
> +these are simply;
> +AP_DECLARE(int) ap_cstr_casecmpn(const char *s1,
> + const char *s2,
> apr_size_t n)
> +{
> +return apr_cstr_casecmpn(s1, s2, n);
> +}
> +   ]
>

You cannot have httpd build in such a way that when one exigent circumstance
changes,  the resulting httpd binary is now a different binary with
different
exported symbols.

E.g.

  1. Install apr-1.5
  2. Build httpd 2.4.recent
  3. Build thirdparty mod_foo, referencing ap_cstr_casecmp()
  4. Pick up, build and install apr-1.6
  5. Pick up httpd 2.4.latest, build and install over 2.4.recent
  6. Start httpd.  LoadModule mod_foo fails, ap_cstr_casecmp() unresolved
  7. httpd fails to start.

We have a contract with third party modules that, once built against 2.4.x,
the will continue to work unmodified when loaded in 2.4.x+1.

It's a lesson from Compatibility 101.


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

2016-06-06 Thread 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

2016-06-06 Thread 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':








Re: svn commit: r1747004 - in /httpd/httpd/branches/2.4.x: STATUS include/ap_mmn.h include/httpd.h server/util.c

2016-06-06 Thread Stefan Eissing
*Nods and stands in a corner*

> Am 06.06.2016 um 15:59 schrieb Eric Covener :
> 
> On Mon, Jun 6, 2016 at 9:58 AM,   wrote:
>> 
>> URL: http://svn.apache.org/viewvc?rev=1747004=rev
>> Log:
>> vote
>> 
>> Modified:
>>httpd/httpd/branches/2.4.x/STATUS
>>httpd/httpd/branches/2.4.x/include/ap_mmn.h
>>httpd/httpd/branches/2.4.x/include/httpd.h
>>httpd/httpd/branches/2.4.x/server/util.c
> 
> 
> inadvertent?
> 
> -- 
> Eric Covener
> cove...@gmail.com



Re: svn commit: r1747004 - in /httpd/httpd/branches/2.4.x: STATUS include/ap_mmn.h include/httpd.h server/util.c

2016-06-06 Thread Eric Covener
On Mon, Jun 6, 2016 at 9:58 AM,   wrote:
>
> URL: http://svn.apache.org/viewvc?rev=1747004=rev
> Log:
> vote
>
> Modified:
> httpd/httpd/branches/2.4.x/STATUS
> httpd/httpd/branches/2.4.x/include/ap_mmn.h
> httpd/httpd/branches/2.4.x/include/httpd.h
> httpd/httpd/branches/2.4.x/server/util.c


inadvertent?

-- 
Eric Covener
cove...@gmail.com