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 d0958692c0d474d050f651e17e1311454d50ff5c..f1fb0db5a7a1c2bed9ff2fae60c9af0eb2b97621 100644 (file)
--- 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 cc5a92e55cf2f4ca2c6fd088dbe03f9d5326e670..ee5905b7ae67d56e0c93a35678e65b3588d1af9f 100644 (file)
--- 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;
     }
 
     /*