From: Stefan Fritsch <sf@apache.org>
Date: Sat, 19 Nov 2011 22:06:16 +0000 (+0000)
Subject: clarify comment
X-Git-Tag: 2.5.0-alpha~7852
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=294efcbd325e8269ff3a21113c68113277352d2d;p=apache

clarify comment
remove broken recursion counting bits


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

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 6547d7b9d3..81143e5ac4 100644
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -58,8 +58,8 @@ static void expr_dump_tree(const ap_expr_t *e, const server_rec *s,
 
 /*
  * To reduce counting overhead, we only count calls to
- * ap_expr_eval_word() and ap_expr_eval(). This means the actual
- * recursion may be twice as deep.
+ * ap_expr_eval_word() and ap_expr_eval(). The max number of
+ * stack frames is larger by some factor.
  */
 #define AP_EXPR_MAX_RECURSION   20
 static int inc_rec(ap_expr_eval_ctx_t *ctx)
@@ -711,7 +711,6 @@ static int ap_expr_eval(ap_expr_eval_ctx_t *ctx, const ap_expr_t *node)
             result ^= TRUE;
             goto out;
         case op_False:
-            ctx->reclvl--;
             result ^= FALSE;
             goto out;
         case op_Not:
@@ -728,7 +727,6 @@ static int ap_expr_eval(ap_expr_eval_ctx_t *ctx, const ap_expr_t *node)
                 }
                 else {
                     if (ap_expr_eval(ctx, e1)) {
-                        ctx->reclvl--;
                         result ^= TRUE;
                         goto out;
                     }