Add couple of hooks to the APacheCore.def file. Port mod_auth_anon and mod_digest to

use the new hooks.

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

diff --git a/ApacheCore.def b/ApacheCore.def
index 6b062b07898a0a13bd9439d11aed257d63f74103..02d07acd8fc918a25770fc051185ba32935e3054 100644 (file)
--- a/ApacheCore.def
+++ b/ApacheCore.def
@@ -363,3 +363,5 @@ EXPORTS
        ap_hook_sort_register @358
        ap_hook_process_connection @359
        ap_process_http_connection @360
+       ap_hook_check_user_id @361
+       ap_hook_auth_checker @362

diff --git a/libhttpd.def b/libhttpd.def
index 6b062b07898a0a13bd9439d11aed257d63f74103..02d07acd8fc918a25770fc051185ba32935e3054 100644 (file)
--- a/libhttpd.def
+++ b/libhttpd.def
@@ -363,3 +363,5 @@ EXPORTS
        ap_hook_sort_register @358
        ap_hook_process_connection @359
        ap_process_http_connection @360
+       ap_hook_check_user_id @361
+       ap_hook_auth_checker @362

diff --git a/modules/aaa/mod_auth_anon.c b/modules/aaa/mod_auth_anon.c
index c137a7b07b81bb9e52c441a16c9fe29e18127342..191fd9e5418d896764415827b64f6ebfbe9f6f93 100644 (file)
--- a/modules/aaa/mod_auth_anon.c
+++ b/modules/aaa/mod_auth_anon.c
@@ -288,27 +288,20 @@ static int check_anon_access(request_rec *r)
 #endif
     return DECLINED;
 }
-
+static void register_hooks(void)
+{
+    ap_hook_check_user_id(anon_authenticate_basic_user,NULL,NULL,HOOK_MIDDLE);
+    ap_hook_auth_checker(check_anon_access,NULL,NULL,HOOK_MIDDLE);
+}
 
 module MODULE_VAR_EXPORT anon_auth_module =
 {
-    STANDARD_MODULE_STUFF,
-    NULL,                      /* initializer */
-    create_anon_auth_dir_config,       /* dir config creater */
+    STANDARD20_MODULE_STUFF,
+    create_anon_auth_dir_config,/* dir config creater */
     NULL,                      /* dir merger ensure strictness */
     NULL,                      /* server config */
     NULL,                      /* merge server config */
     anon_auth_cmds,            /* command table */
     NULL,                      /* handlers */
-    NULL,                      /* filename translation */
-    anon_authenticate_basic_user,      /* check_user_id */
-    check_anon_access,         /* 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 */
+    register_hooks             /* register hooks */
 };