From: Stefan Fritsch <sf@apache.org>
Date: Wed, 6 Jul 2011 20:07:56 +0000 (+0000)
Subject: Fix regexp RewriteCond with NoCase,
X-Git-Tag: 2.3.14^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=832670d8b2ae59ee2e459b46155ba44246817f0a;p=thirdparty%2Fapache%2Fhttpd.git

Fix regexp RewriteCond with NoCase,
reported by Steffen <info apachelounge com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1143541 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index ca502651fa4..c0a4bf69412 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.3.14
 
+  *) mod_rewrite: Fix regexp RewriteCond with NoCase. [Stefan Fritsch]
+
   *) mod_log_debug: New module that allows to log custom messages at various
      phases in the request processing. [Stefan Fritsch]
 
diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index 45363394acf..b6fda3250a3 100644
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3298,7 +3298,8 @@ static const char *cmd_rewritecond(cmd_parms *cmd, void *in_dconf,
         }
     }
 
-    if ((newcond->ptype < CONDPAT_STR_LT || newcond->ptype > CONDPAT_STR_GE) &&
+    if ((newcond->ptype != CONDPAT_REGEX) &&
+        (newcond->ptype < CONDPAT_STR_LT || newcond->ptype > CONDPAT_STR_GE) &&
         (newcond->flags & CONDFLAG_NOCASE)) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
                      "RewriteCond: NoCase option for non-regex pattern '%s' "