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&view=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&r1=1747055&r2=1747056&view=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&r1=1747055&r2=1747056&view=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':
