From: Thomas J. Donovan <tdonovan@apache.org>
Date: Sun, 24 Feb 2013 13:58:07 +0000 (+0000)
Subject: bug 54548 - use new expr parser with 'elif', like 'if'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f77dc6256e8a3f9e4f40c907c8609def7372efa9;p=thirdparty%2Fapache%2Fhttpd.git

bug 54548 - use new expr parser with 'elif', like 'if'

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

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 8b9c4c774b9..af90db67284 100644
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2411,7 +2411,10 @@ static apr_status_t handle_elif(include_ctx_t *ctx, ap_filter_t *f,
         return APR_SUCCESS;
     }
 
-    expr_ret = parse_expr(ctx, expr, &was_error);
+    if (ctx->intern->legacy_expr)
+        expr_ret = parse_expr(ctx, expr, &was_error);
+    else
+        expr_ret = parse_ap_expr(ctx, expr, &was_error);
 
     if (was_error) {
         SSI_CREATE_ERROR_BUCKET(ctx, f, bb);