Commit f68d97e9 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent 9ecc9b9e

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -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.

modules/mappers/mod_rewrite.c

+8 −0
Original line number Diff line number Diff line
@@ -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':