From c74ebcb12d44ca888628598cb60a934771b62b8a Mon Sep 17 00:00:00 2001 From: Bill Stoddard Date: Mon, 30 Aug 1999 15:43:48 +0000 Subject: [PATCH] Port a few more modules to use the new hooks style. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83848 13f79535-47bb-0310-9956-ffa450edef68 --- modules/mappers/mod_speling.c | 20 ++++++-------------- modules/metadata/mod_cern_meta.c | 24 ++++++++---------------- modules/metadata/mod_expires.c | 20 ++++++-------------- modules/metadata/mod_headers.c | 20 ++++++-------------- modules/metadata/mod_usertrack.c | 20 ++++++-------------- 5 files changed, 32 insertions(+), 72 deletions(-) diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c index 067fd77c71..eb0e76a5e1 100644 --- a/modules/mappers/mod_speling.c +++ b/modules/mappers/mod_speling.c @@ -533,26 +533,18 @@ static int check_speling(request_rec *r) return OK; } - +static void register_hooks(void) +{ + ap_hook_fixups(check_speling,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT speling_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, create_mconfig_for_directory, /* create per-dir config */ NULL, /* merge per-dir config */ create_mconfig_for_server, /* server config */ NULL, /* merge server config */ speling_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - check_speling, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_cern_meta.c b/modules/metadata/mod_cern_meta.c index dbc1de6cab..f684600629 100644 --- a/modules/metadata/mod_cern_meta.c +++ b/modules/metadata/mod_cern_meta.c @@ -370,26 +370,18 @@ static int add_cern_meta_data(request_rec *r) return rv; } - +static void register_hooks(void) +{ + ap_hook_fixups(add_cern_meta_data,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT cern_meta_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ - create_cern_meta_dir_config, /* dir config creater */ - merge_cern_meta_dir_configs, /* dir merger --- default is to override */ + STANDARD20_MODULE_STUFF, + create_cern_meta_dir_config,/* dir config creater */ + merge_cern_meta_dir_configs,/* dir merger --- default is to override */ NULL, /* server config */ NULL, /* merge server configs */ cern_meta_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - add_cern_meta_data, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index 4fcf51a810..8ed69cc804 100644 --- a/modules/metadata/mod_expires.c +++ b/modules/metadata/mod_expires.c @@ -485,26 +485,18 @@ static int add_expires(request_rec *r) ap_table_setn(r->headers_out, "Expires", ap_gm_timestr_822(r->pool, expires)); return OK; } - +static void register_hooks(void) +{ + ap_hook_fixups(add_expires,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT expires_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, create_dir_expires_config, /* dir config creater */ merge_expires_dir_configs, /* dir merger --- default is to override */ NULL, /* server config */ NULL, /* merge server configs */ expires_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - add_expires, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_headers.c b/modules/metadata/mod_headers.c index c3d50503ee..8518ce43cc 100644 --- a/modules/metadata/mod_headers.c +++ b/modules/metadata/mod_headers.c @@ -240,26 +240,18 @@ static int fixup_headers(request_rec *r) return DECLINED; } - +static void register_hooks(void) +{ + ap_hook_fixups(fixup_headers,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT headers_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, create_headers_dir_config, /* dir config creater */ merge_headers_config, /* dir merger --- default is to override */ create_headers_config, /* server config */ merge_headers_config, /* merge server configs */ headers_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - fixup_headers, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ }; diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c index 1b50e15996..0372e32aa1 100644 --- a/modules/metadata/mod_usertrack.c +++ b/modules/metadata/mod_usertrack.c @@ -353,25 +353,17 @@ static const command_rec cookie_log_cmds[] = { "name of the tracking cookie"}, {NULL} }; - +static void register_hooks(void) +{ + ap_hook_fixups(spot_cookie,NULL,NULL,HOOK_MIDDLE); +} module MODULE_VAR_EXPORT usertrack_module = { - STANDARD_MODULE_STUFF, - NULL, /* initializer */ + STANDARD20_MODULE_STUFF, make_cookie_dir, /* dir config creater */ NULL, /* dir merger --- default is to override */ make_cookie_log_state, /* server config */ NULL, /* merge server configs */ cookie_log_cmds, /* command table */ NULL, /* handlers */ - NULL, /* filename translation */ - NULL, /* check_user_id */ - NULL, /* check auth */ - NULL, /* check access */ - NULL, /* type_checker */ - spot_cookie, /* fixups */ - NULL, /* logger */ - NULL, /* header parser */ - NULL, /* child_init */ - NULL, /* child_exit */ - NULL /* post read-request */ + register_hooks /* register hooks */ }; -- 2.50.1