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/24 14:58:07 UTC
svn commit: r1449479 - /httpd/httpd/trunk/modules/filters/mod_include.c
Author: tdonovan
Date: Sun Feb 24 13:58:07 2013
New Revision: 1449479
URL: http://svn.apache.org/r1449479
Log:
bug 54548 - use new expr parser with 'elif', like 'if'
Modified:
httpd/httpd/trunk/modules/filters/mod_include.c
Modified: httpd/httpd/trunk/modules/filters/mod_include.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_include.c?rev=1449479&r1=1449478&r2=1449479&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_include.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_include.c Sun Feb 24 13:58:07 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);
Re: svn commit: r1449479 - /httpd/httpd/trunk/modules/filters/mod_include.c
Posted by Graham Leggett <mi...@sharp.fm>.
On 24 Feb 2013, at 4:31 PM, Eric Covener <co...@gmail.com> wrote:
> probably CHANGES-worthy
And backport worthy, existing behaviour looks broken to me.
Regards,
Graham
--
Re: svn commit: r1449479 - /httpd/httpd/trunk/modules/filters/mod_include.c
Posted by Eric Covener <co...@gmail.com>.
probably CHANGES-worthy
On Sun, Feb 24, 2013 at 8:58 AM, <td...@apache.org> wrote:
> Author: tdonovan
> Date: Sun Feb 24 13:58:07 2013
> New Revision: 1449479
>
> URL: http://svn.apache.org/r1449479
> Log:
> bug 54548 - use new expr parser with 'elif', like 'if'
>
> Modified:
> httpd/httpd/trunk/modules/filters/mod_include.c
>
> Modified: httpd/httpd/trunk/modules/filters/mod_include.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_include.c?rev=1449479&r1=1449478&r2=1449479&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/filters/mod_include.c (original)
> +++ httpd/httpd/trunk/modules/filters/mod_include.c Sun Feb 24 13:58:07 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);
>
>
--
Eric Covener
covener@gmail.com