httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Eric Covener <cove...@gmail.com>
Subject Re: svn commit: r1449479 - /httpd/httpd/trunk/modules/filters/mod_include.c
Date Sun, 24 Feb 2013 14:31:56 GMT
probably CHANGES-worthy

On Sun, Feb 24, 2013 at 8:58 AM,  <tdonovan@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

Mime
View raw message