You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by nd...@apache.org on 2004/02/28 23:19:04 UTC
cvs commit: apache-1.3/src/modules/standard mod_include.c
nd 2004/02/28 14:19:04
Modified: src CHANGES
src/modules/standard mod_include.c
Log:
Don't assume that the first character of a conditional expression is
a non-special.
Reviewed by: Jeff Trawick, Justin Erenkrantz
Revision Changes Path
1.1930 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1929
retrieving revision 1.1930
diff -u -u -r1.1929 -r1.1930
--- CHANGES 20 Feb 2004 22:40:50 -0000 1.1929
+++ CHANGES 28 Feb 2004 22:19:03 -0000 1.1930
@@ -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]
1.140 +1 -1 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -u -r1.139 -r1.140
--- mod_include.c 20 Feb 2004 20:37:40 -0000 1.139
+++ mod_include.c 28 Feb 2004 22:19:04 -0000 1.140
@@ -1265,7 +1265,7 @@
}
/* We should only be here if we are in a string */
if (!qs) {
- token->value[next++] = ch;
+ --string;
}
/*