when parsing a conditional expression, don't assume the first

character to be a non-special.

Reviewed by: Jeff Trawick, Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index e4ee2c533c9e19c8ed421fea18a5043ce55def01..adf65d451827eb0c4806f7af38ec525b338a73f7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.49
 
+  *) Fix mod_include's expression parser to recognize strings correctly
+     even if they start with an escaped token.  [André Malo]
+
   *) Add fatal exception hook for use by diagnostic modules.  The hook
      is only available if the --enable-exception-hook configure parm 
      is used and the EnableExceptionHook directive has been set to 

diff --git a/STATUS b/STATUS
index 8fe5b83edc4a90d099673145864d2d544d7ea590..81643110e024773838e5cbe1df1f972ac8329383 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/02/28 00:53:55 $]
+Last modified at [$Date: 2004/02/28 21:28:55 $]
 
 Release:
 
@@ -231,13 +231,6 @@ PATCHES TO BACKPORT FROM 2.1
       PREREQ: Blow away of SSL_EXPERIMENTAL_ENGINE (see above)
       +1: jwoolley, trawick, jim, jerenkrantz
 
-    * mod_include's expression tokenizer: don't skip the first character of
-      a string, it may be a backslash. (2.0 + 1.3)
-      (patch for 2.0: http://cvs.apache.org/~nd/ssi-escape.patch)
-      1.3 goes the same way.
-        modules/filters/mod_include.c: r1.264
-      +1: nd, trawick, jerenkrantz
-
     * When UseCanonicalName is set to OFF, allow ap_get_server_port to 
       check r->connection->local_addr->port before defaulting to 
       server->port or ap_default_port()

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 032dd4f04ee67c1604bc00a725a720debf3c9b45..2cf8fff651f5da29dcdadfb939f49d7efa3f5480 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -1335,7 +1335,7 @@ static const char *get_ptoken(request_rec *r, const char *string,
     token->value = apr_palloc(r->pool, strlen(string) + 2); /* 2 for ch plus
                                                                trailing null */
     if (!qs) {
-        token->value[next++] = ch;
+        --string;
     }
 
     /*