From: André Malo <nd@apache.org>
Date: Sat, 28 Feb 2004 22:19:04 +0000 (+0000)
Subject: Don't assume that the first character of a conditional expression is
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fed875e89d7711f20780b8073a8c9ec2b7e78c80;p=thirdparty%2Fapache%2Fhttpd.git

Don't assume that the first character of a conditional expression is
a non-special.

Reviewed by: Jeff Trawick, Justin Erenkrantz


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

diff --git a/src/CHANGES b/src/CHANGES
index d0958692c0d..f1fb0db5a7a 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 1.3.30
 
+  *) Fix mod_include's expression parser to recognize strings correctly
+     even if they start with an escaped token.  [André Malo]
+
   *) The whole codebase was relicensed and is now available under
      the Apache License, Version 2.0 (http://www.apache.org/licenses).
      [Apache Software Foundation]
diff --git a/src/modules/standard/mod_include.c b/src/modules/standard/mod_include.c
index cc5a92e55cf..ee5905b7ae6 100644
--- a/src/modules/standard/mod_include.c
+++ b/src/modules/standard/mod_include.c
@@ -1265,7 +1265,7 @@ static const char *get_ptoken(request_rec *r, const char *string, struct token *
     }
     /* We should only be here if we are in a string */
     if (!qs) {
-        token->value[next++] = ch;
+        --string;
     }
 
     /*