You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by td...@apache.org on 2013/02/26 03:18:04 UTC
svn commit: r1449999 - in /httpd/httpd/branches/2.4.x: CHANGES STATUS
modules/filters/mod_include.c
Author: tdonovan
Date: Tue Feb 26 02:18:04 2013
New Revision: 1449999
URL: http://svn.apache.org/r1449999
Log:
Backport r1449479 from trunk.
mod_include: Use new ap_expr for 'elif'. [PR 54548]
Modified:
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/filters/mod_include.c
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1449999&r1=1449998&r2=1449999&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Tue Feb 26 02:18:04 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1449999&r1=1449998&r2=1449999&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Feb 26 02:18:04 2013
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/filters/mod_include.c?rev=1449999&r1=1449998&r2=1449999&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/filters/mod_include.c (original)
+++ httpd/httpd/branches/2.4.x/modules/filters/mod_include.c Tue Feb 26 02:18:04 2013
@@ -2411,7 +2411,10 @@ static apr_status_t handle_elif(include_
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);