Backport r1449479 from trunk.

mod_include: Use new ap_expr for 'elif'. [PR 54548]

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

diff --git a/CHANGES b/CHANGES
index 9fcea4fca6145bf3ed19589f3e0a338bf09d8852..2c1c5d345d27702526a741102572a03ef9677f49 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 
 Changes with Apache 2.4.5
 
+  * mod_include: Use new ap_expr for 'elif', like 'if', 
+    if legacy parser is not specified.  PR 54548 [Tom Donovan]
 
 Changes with Apache 2.4.4
 

diff --git a/STATUS b/STATUS
index d835952710c6fad5194f19849a8a620f07799ef5..03f0e0c93d0443f9a6c338e89f01abab4f1c4e40 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -135,11 +135,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch applies.
     +1: wrowe, covener
 
-  * mod_include: Use new ap_expr for 'elif', like 'if', if legacy parser is not specified.  [PR 54548]
-    trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1449479
-    +1: tdonovan, 
-    +1: covener (please add w/ CHANGES in 2.4), sf
-
   * mod_heartmonitor/mod_lbmethod_heartbeat: Respect DefaultRuntimeDir for 
     storage path; these have a directive to configure this location
     and THIS CHANGE WILL BREAK PRACTICALLY ALL EXISTING 2.4 CONFIGURATIONS

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 8b9c4c774b975624533636ecd392841a1c3c54b5..af90db6728498cc274d0a904e447368f3d2355c1 100644 (file)
--- 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);