keep the parse tree consistent if a binary operator occurs within

parentheses.

Reviewed by: Brian Pane, Jeff Trawick

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

diff --git a/STATUS b/STATUS
index a8b3e18e244a0e1ed5915204177800a10d55367f..a7c3a0f998f4ae16912e057b636b75dbd6840414 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/09/21 21:23:34 $]
+Last modified at [$Date: 2003/09/21 21:29:27 $]
 
 Release:
 
@@ -307,12 +307,6 @@ PATCHES TO PORT FROM 2.1
                with some valid "fake" values. Though I don't think that it's
                really necessary -- how does this sound?
 
-    * Fix inconsistency in generated expression parse tree. (2.0 + 1.3)
-      There's also a practical advantage; it saves some CPU cycles, since the
-      tree walk is shorter.
-        modules/filters/mod_include.c: r1.261
-      +1: nd, brianp, trawick
-
     * 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)

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 067e281f22fc91e518cc7b15470b3cf34f290ed5..1dc3a2b4a658ff75db75657e35d68590f61bce15 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2071,6 +2071,7 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
             }
             else {
                 new->left = current->right;
+                new->left->parent = new;
                 current->right = new;
                 new->parent = current;
             }
@@ -2177,6 +2178,7 @@ static int parse_expr(request_rec *r, include_ctx_t *ctx, const char *expr,
             }
             else {
                 new->left = current->right;
+                new->left->parent = new;
                 current->right = new;
                 new->parent = current;
             }