and swap Auth/UserCheck names to match the hook names, in hopes of preventing further...

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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index ff6b5394997de69921f710d1cb3476c704edaa0a..97c2c4c1bdac9ca5394958cae848bc9afb99d24b 100644 (file)
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -465,10 +465,10 @@ static void ssl_register_hooks(apr_pool_t *p)
     ap_hook_pre_config    (ssl_hook_pre_config,    NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_child_init    (ssl_init_Child,         NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_translate_name(ssl_hook_Translate,     NULL,NULL, APR_HOOK_MIDDLE);
-    ap_hook_check_user_id (ssl_hook_Auth,          NULL,NULL, APR_HOOK_FIRST);
+    ap_hook_check_user_id (ssl_hook_UserCheck,     NULL,NULL, APR_HOOK_FIRST);
     ap_hook_fixups        (ssl_hook_Fixup,         NULL,NULL, APR_HOOK_MIDDLE);
     ap_hook_access_checker(ssl_hook_Access,        NULL,NULL, APR_HOOK_MIDDLE);
-    ap_hook_auth_checker  (ssl_hook_UserCheck,     NULL,NULL, APR_HOOK_MIDDLE);
+    ap_hook_auth_checker  (ssl_hook_Auth,          NULL,NULL, APR_HOOK_MIDDLE);
 
     ssl_var_register();
 }

diff --git a/modules/ssl/ssl_engine_kernel.c b/modules/ssl/ssl_engine_kernel.c
index 95bd472a95c9fc9bf0f7254618fee1fe38dc09ce..943a190a181b83cc2d1180b64ae4cda3ee9bdf06 100644 (file)
--- a/modules/ssl/ssl_engine_kernel.c
+++ b/modules/ssl/ssl_engine_kernel.c
@@ -1166,7 +1166,7 @@ int ssl_hook_Access(request_rec *r)
 }
 
 /*
- *  Auth Handler:
+ *  Authentication Handler:
  *  Fake a Basic authentication from the X509 client certificate.
  *
  *  This must be run fairly early on to prevent a real authentication from
@@ -1174,7 +1174,7 @@ int ssl_hook_Access(request_rec *r)
  *  authenticates a user.  This means that the Module statement for this
  *  module should be LAST in the Configuration file.
  */
-int ssl_hook_Auth(request_rec *r)
+int ssl_hook_UserCheck(request_rec *r)
 {
     SSLSrvConfigRec *sc = mySrvConfig(r->server);
     SSLDirConfigRec *dc = myDirConfig(r);
@@ -1245,7 +1245,8 @@ int ssl_hook_Auth(request_rec *r)
     return DECLINED;
 }
 
-int ssl_hook_UserCheck(request_rec *r)
+/* authorization phase */
+int ssl_hook_Auth(request_rec *r)
 {
     SSLDirConfigRec *dc = myDirConfig(r);