From: Brian Pane <brianp@apache.org>
Date: Sat, 25 May 2002 04:06:35 +0000 (+0000)
Subject: Fix for mod_include's parsing of "/regexp/" expressions in
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88a782e899612d3e4f14ff366f49319303f71ed0;p=thirdparty%2Fapache%2Fhttpd.git

Fix for mod_include's parsing of "/regexp/" expressions in
<!--#if directives
Submitted by:	Julius Gawlas <julius_gawlas@hp.com>
Reviewed by:	Brian Pane


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

diff --git a/CHANGES b/CHANGES
index ff11dc268e9..b1947482b89 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.37
 
+  *) Fix mod_include's handling of regular expressions in
+     "<!--#if" directives [Julius Gawlas <julius_gawlas@hp.com>]
+
   *) Fix the worker MPM deadlock problem  [Brian Pane]
 
   *) Modify the module documentation to allow for translations.
diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index d8b993ab26a..264e8ad1e65 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1890,6 +1890,7 @@ static const char *get_ptoken(request_rec *r, const char *string,
                 if (ch == qs) {
                     qs = 0;
                     tkn_fnd = 1;
+                    string++;
                 }
                 else {
                     token->value[next++] = ch;