Start to implement module-defined hooks that are a) fast and b) typesafe.

Replace pre_connection module call with a register_hook call and
implement pre_connection as a hook. The intent is that these hooks will
be extended to allow Apache to be multi-protocol, and also to allow the
calling order to be specified on a per-hook/per-module basis.  [Ben Laurie]

Port a bunch of modules to the new module structure.
["Michael H. Voase" <mvoase@midcoast.com.au>]

Submitted by:   Ben Laurie

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83786 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/filters/mod_include.c b/modules/filters/mod_include.c
index 3ee96db83b5033da911f7cf112776578b5edc963..4d7df16210109142b958db64bc5a6ccc1add52f4 100644 (file)
--- a/modules/filters/mod_include.c
+++ b/modules/filters/mod_include.c
@@ -2464,23 +2464,21 @@ static const handler_rec includes_handlers[] =
 
 module MODULE_VAR_EXPORT includes_module =
 {
-    STANDARD_MODULE_STUFF,
-    NULL,                       /* initializer */
+    STANDARD20_MODULE_STUFF,
+    NULL,                       /* pre_config */
+    NULL,                       /* post_config */
+    NULL,                       /* open_logs */
+    NULL,                       /* child initializer */
     create_includes_dir_config, /* dir config creater */
     NULL,                       /* dir merger --- default is to override */
     NULL,                       /* server config */
     NULL,                       /* merge server config */
     includes_cmds,              /* command table */
     includes_handlers,          /* handlers */
-    NULL,                       /* filename translation */
-    NULL,                       /* check_user_id */
     NULL,                       /* check auth */
     NULL,                       /* check access */
     NULL,                       /* type_checker */
     NULL,                       /* fixups */
     NULL,                       /* logger */
-    NULL,                       /* header parser */
-    NULL,                       /* child_init */
-    NULL,                       /* child_exit */
-    NULL                        /* post read-request */
+    NULL                       /* register hooks */
 };

diff --git a/modules/generators/mod_autoindex.c b/modules/generators/mod_autoindex.c
index 9c28dc4086438daea0d5f98a62255929a6c9e04a..99b2c88d9bfcab31dde5475816083fdff085e8b7 100644 (file)
--- a/modules/generators/mod_autoindex.c
+++ b/modules/generators/mod_autoindex.c
@@ -1651,23 +1651,12 @@ static const handler_rec autoindex_handlers[] =
 
 module MODULE_VAR_EXPORT autoindex_module =
 {
-    STANDARD_MODULE_STUFF,
-    NULL,                      /* initializer */
+    STANDARD20_MODULE_STUFF,
     create_autoindex_config,   /* dir config creater */
     merge_autoindex_configs,   /* dir merger --- default is to override */
     NULL,                      /* server config */
     NULL,                      /* merge server config */
     autoindex_cmds,            /* command table */
     autoindex_handlers,                /* handlers */
-    NULL,                      /* filename translation */
-    NULL,                      /* check_user_id */
-    NULL,                      /* check auth */
-    NULL,                      /* check access */
-    NULL,                      /* type_checker */
-    NULL,                      /* fixups */
-    NULL,                      /* logger */
-    NULL,                      /* header parser */
-    NULL,                      /* child_init */
-    NULL,                      /* child_exit */
-    NULL                       /* post read-request */
+    NULL                       /* register hooks */
 };