stoddard 99/08/30 08:43:50
Modified: src/modules/standard mod_cern_meta.c mod_expires.c
mod_headers.c mod_speling.c mod_usertrack.c
Log:
Port a few more modules to use the new hooks style.
Revision Changes Path
1.2 +8 -16 apache-2.0/src/modules/standard/mod_cern_meta.c
Index: mod_cern_meta.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_cern_meta.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_cern_meta.c 1999/08/24 06:55:25 1.1
+++ mod_cern_meta.c 1999/08/30 15:43:47 1.2
@@ -370,26 +370,18 @@
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 */
};
1.2 +6 -14 apache-2.0/src/modules/standard/mod_expires.c
Index: mod_expires.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_expires.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_expires.c 1999/08/24 06:55:26 1.1
+++ mod_expires.c 1999/08/30 15:43:47 1.2
@@ -485,26 +485,18 @@
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 */
};
1.2 +6 -14 apache-2.0/src/modules/standard/mod_headers.c
Index: mod_headers.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_headers.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_headers.c 1999/08/24 06:55:26 1.1
+++ mod_headers.c 1999/08/30 15:43:48 1.2
@@ -240,26 +240,18 @@
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 */
};
1.2 +6 -14 apache-2.0/src/modules/standard/mod_speling.c
Index: mod_speling.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_speling.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_speling.c 1999/08/24 06:55:38 1.1
+++ mod_speling.c 1999/08/30 15:43:48 1.2
@@ -533,26 +533,18 @@
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 */
};
1.2 +6 -14 apache-2.0/src/modules/standard/mod_usertrack.c
Index: mod_usertrack.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_usertrack.c 1999/08/24 06:55:38 1.1
+++ mod_usertrack.c 1999/08/30 15:43:48 1.2
@@ -353,25 +353,17 @@
"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 */
};
