From: Jim Jagielski <jim@apache.org>
Date: Mon, 6 Jun 2016 19:11:20 +0000 (+0000)
Subject: Merge r1744206 from trunk:
X-Git-Tag: 2.4.21~77
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1e2c0a8be4b24f27189409cccabdf5a67ce71dc7;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1747056 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 505542423b..e9710e7e0e 100644
--- a/STATUS
+++ b/STATUS
@@ -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.
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index d31b1c2463..5be5c5aaff 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -560,6 +560,14 @@ static unsigned is_absolute_uri(char *uri, int *supportsqs)
             *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':