From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 28 Sep 2009 00:48:27 +0000 (+0000)
Subject: mod_rewrite: Add scgi scheme detection (backport r729538). [André Malo]
X-Git-Tag: 2.2.15~205
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a85db9e031918659c287e72a0598a5d9bc5da8a;p=thirdparty%2Fapache%2Fhttpd.git

mod_rewrite: Add scgi scheme detection (backport r729538). [André Malo]


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

diff --git a/CHANGES b/CHANGES
index 2e2cb2886dc..05c06b94e92 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.15
 
+  *) mod_rewrite: Add scgi scheme detection (backport r729538). [André Malo]
+
   *) mod_ssl: fixed wrong 3rd parameter passed to apr_brigade_split_line().
      Reported on the list by Jie Gao. [Guenter Knauf]
 
diff --git a/STATUS b/STATUS
index 27ad5378295..c1724c1bec8 100644
--- a/STATUS
+++ b/STATUS
@@ -87,12 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_rewrite: Add scgi scheme detection. /me completely forgot, that
-   mod_rewrite was extended for this as well...
-   Trunk Patch: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_rewrite.c?r1=728220&r2=729538
-   (applies with 40 lines offset in 2.2)
-   +1: nd, minfrin, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index b9c8a51ff88..e92c440986d 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -606,6 +606,13 @@ static unsigned is_absolute_uri(char *uri)
             return 7;
         }
         break;
+
+    case 's':
+    case 'S':
+        if (!strncasecmp(uri, "cgi://", 6)) {       /* scgi://   */
+            return 7;
+        }
+        break;
     }
 
     return 0;