httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.c ssl_engine_kernel.c
Date Tue, 21 Aug 2001 06:08:04 GMT
dougm       01/08/20 23:08:04

  Modified:    modules/ssl mod_ssl.c ssl_engine_kernel.c
  Log:
  and swap Auth/UserCheck names to match the hook names, in hopes of preventing further foncusion
  
  Revision  Changes    Path
  1.19      +2 -2      httpd-2.0/modules/ssl/mod_ssl.c
  
  Index: mod_ssl.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- mod_ssl.c	2001/08/21 05:57:13	1.18
  +++ mod_ssl.c	2001/08/21 06:08:04	1.19
  @@ -465,10 +465,10 @@
       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();
   }
  
  
  
  1.16      +4 -3      httpd-2.0/modules/ssl/ssl_engine_kernel.c
  
  Index: ssl_engine_kernel.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_kernel.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ssl_engine_kernel.c	2001/08/20 23:58:48	1.15
  +++ ssl_engine_kernel.c	2001/08/21 06:08:04	1.16
  @@ -1166,7 +1166,7 @@
   }
   
   /*
  - *  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 @@
    *  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 @@
       return DECLINED;
   }
   
  -int ssl_hook_UserCheck(request_rec *r)
  +/* authorization phase */
  +int ssl_hook_Auth(request_rec *r)
   {
       SSLDirConfigRec *dc = myDirConfig(r);
   
  
  
  

Mime
View raw message