You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Ruediger Pluem <rp...@apache.org> on 2010/11/08 08:02:55 UTC
Re: svn commit: r1032073 [1/3] - in /httpd/httpd/trunk: ./ include/
modules/aaa/ modules/filters/ modules/metadata/ modules/ssl/ server/
On 11/06/2010 03:31 PM, sf@apache.org wrote:
> Author: sf
> Date: Sat Nov 6 14:31:16 2010
> New Revision: 1032073
>
> URL: http://svn.apache.org/viewvc?rev=1032073&view=rev
> Log:
> Replace ap_expr with a parser derived from mod_ssl's parser. Make mod_ssl use
> the new parser. Rework ap_expr's public interface and provide hooks for modules
> to add variables and functions.
>
> The Netware and Windows build files still need to be adjusted
>
> Added:
> httpd/httpd/trunk/server/util_expr_eval.c
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr_eval.c
> httpd/httpd/trunk/server/util_expr_parse.c
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr_parse.c
> httpd/httpd/trunk/server/util_expr_parse.h
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr_parse.h
> httpd/httpd/trunk/server/util_expr_parse.y
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr_parse.y
> httpd/httpd/trunk/server/util_expr_private.h
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr.h
> httpd/httpd/trunk/server/util_expr_scan.c
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr_scan.c
> httpd/httpd/trunk/server/util_expr_scan.l
> - copied, changed from r1032057, httpd/httpd/trunk/modules/ssl/ssl_expr_scan.l
> Removed:
> httpd/httpd/trunk/modules/ssl/ssl_expr.c
> httpd/httpd/trunk/modules/ssl/ssl_expr.h
> httpd/httpd/trunk/modules/ssl/ssl_expr_eval.c
> httpd/httpd/trunk/modules/ssl/ssl_expr_parse.c
> httpd/httpd/trunk/modules/ssl/ssl_expr_parse.h
> httpd/httpd/trunk/modules/ssl/ssl_expr_parse.y
> httpd/httpd/trunk/modules/ssl/ssl_expr_scan.c
> httpd/httpd/trunk/modules/ssl/ssl_expr_scan.l
> httpd/httpd/trunk/server/util_expr.c
> Modified:
> httpd/httpd/trunk/CHANGES
> httpd/httpd/trunk/buildconf
> httpd/httpd/trunk/include/ap_expr.h
> httpd/httpd/trunk/include/ap_mmn.h
> httpd/httpd/trunk/include/http_core.h
> httpd/httpd/trunk/modules/aaa/mod_authz_core.c
> httpd/httpd/trunk/modules/filters/mod_filter.c
> httpd/httpd/trunk/modules/metadata/mod_headers.c
> httpd/httpd/trunk/modules/ssl/Makefile.in
> httpd/httpd/trunk/modules/ssl/config.m4
> httpd/httpd/trunk/modules/ssl/mod_ssl.c
> httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
> httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c
> httpd/httpd/trunk/modules/ssl/ssl_engine_vars.c
> httpd/httpd/trunk/modules/ssl/ssl_private.h
> httpd/httpd/trunk/server/Makefile.in
> httpd/httpd/trunk/server/core.c
> httpd/httpd/trunk/server/main.c
> httpd/httpd/trunk/server/request.c
>
> Modified: httpd/httpd/trunk/modules/ssl/mod_ssl.c
> URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/mod_ssl.c?rev=1032073&r1=1032072&r2=1032073&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/ssl/mod_ssl.c (original)
> +++ httpd/httpd/trunk/modules/ssl/mod_ssl.c Sat Nov 6 14:31:16 2010
> @@ -565,11 +565,6 @@ static void ssl_register_hooks(apr_pool_
> &ssl_authz_provider_verify_client,
> AP_AUTH_INTERNAL_PER_CONF);
>
> - ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ssl-require",
> - AUTHZ_PROVIDER_VERSION,
> - &ssl_authz_provider_sslrequire,
> - AP_AUTH_INTERNAL_PER_CONF);
> -
What is the substitute for ssl-require?
> }
>
> module AP_MODULE_DECLARE_DATA ssl_module = {
>
Regards
Rüdiger
Re: svn commit: r1032073 [1/3] - in /httpd/httpd/trunk: ./ include/ modules/aaa/ modules/filters/ modules/metadata/ modules/ssl/ server/
Posted by Stefan Fritsch <sf...@sfritsch.de>.
On Monday 08 November 2010, Ruediger Pluem wrote:
> On 11/06/2010 03:31 PM, sf@apache.org wrote:
> > Author: sf
> > Date: Sat Nov 6 14:31:16 2010
> > New Revision: 1032073
> >
> > URL: http://svn.apache.org/viewvc?rev=1032073&view=rev
> > Log:
> > Replace ap_expr with a parser derived from mod_ssl's parser. Make
> > mod_ssl use the new parser. Rework ap_expr's public interface
> > and provide hooks for modules to add variables and functions.
> > - ap_register_auth_provider(p, AUTHZ_PROVIDER_GROUP, "ssl-
require",
> > - AUTHZ_PROVIDER_VERSION,
> > - &ssl_authz_provider_sslrequire,
> > - AP_AUTH_INTERNAL_PER_CONF);
> > -
>
> What is the substitute for ssl-require?
The expr provider in mod_authz_core. Since the syntax of ap_expr is
now nearly the same as the syntax of ssl_expr, I don't think we need a
separate ssl_expr authz provider. Of course, if anyone thinks it would
be useful, it's easy to add again.