httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl mod_ssl.c mod_ssl.h ssl_engine_ext.c
Date Mon, 30 Jul 2001 22:35:33 GMT
wrowe       01/07/30 15:35:33

  Modified:    modules/ssl mod_ssl.c mod_ssl.h ssl_engine_ext.c
  Log:
    Register for %X, %c (we gotta make a decision, please vote if you care...
    use %c's meaning from the historical SSL modules, or Bill Stoddard's
    connection-terminated meaning?  One will have to give.)
  
  Revision  Changes    Path
  1.10      +2 -3      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- mod_ssl.c	2001/07/19 20:02:28	1.9
  +++ mod_ssl.c	2001/07/30 22:35:33	1.10
  @@ -207,8 +207,8 @@
   static int ssl_hook_pre_config(
       apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)
   {
  -    /* unused */
  -    return DECLINED;
  +    ssl_ext_register(pconf);
  +    return APR_SUCCESS;
   }
   
   static int ssl_hook_post_read_request(request_rec *r)
  @@ -511,7 +511,6 @@
   #endif
   #if 0 /* XXX */
       ssl_var_register();
  -    ssl_ext_register();
       ssl_io_register();
   #endif
   }
  
  
  
  1.22      +1 -1      httpd-2.0/modules/ssl/mod_ssl.h
  
  Index: mod_ssl.h
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- mod_ssl.h	2001/07/19 22:20:09	1.21
  +++ mod_ssl.h	2001/07/30 22:35:33	1.22
  @@ -702,8 +702,8 @@
   int          ssl_rand_seed(server_rec *, apr_pool_t *, ssl_rsctx_t, char *);
   
   /*  Extensions  */
  +void         ssl_ext_register(apr_pool_t *p);
   #if 0 /* XXX */
  -void         ssl_ext_register(void);
   void         ssl_ext_unregister(void);
   #endif
   
  
  
  
  1.5       +19 -12    httpd-2.0/modules/ssl/ssl_engine_ext.c
  
  Index: ssl_engine_ext.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_engine_ext.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ssl_engine_ext.c	2001/05/05 16:55:28	1.4
  +++ ssl_engine_ext.c	2001/07/30 22:35:33	1.5
  @@ -67,8 +67,9 @@
   **  _________________________________________________________________
   */
   
  +#include "..\..\modules\loggers\mod_log_config.h"
  +static void  ssl_ext_mlc_register(apr_pool_t *p);
   #if 0 /* XXX */
  -static void  ssl_ext_mlc_register(void);
   static void  ssl_ext_mlc_unregister(void);
   static void  ssl_ext_mr_register(void);
   static void  ssl_ext_mr_unregister(void);
  @@ -78,10 +79,10 @@
   static void  ssl_ext_ms_unregister(void);
   #endif /* XXX */
   
  -void ssl_ext_register(void)
  +void ssl_ext_register(apr_pool_t *p)
   {
  +    ssl_ext_mlc_register(p);
   #if 0 /* XXX */
  -    ssl_ext_mlc_register();
       ssl_ext_mr_register();
       ssl_ext_mp_register();
       ssl_ext_ms_register();
  @@ -100,7 +101,6 @@
       return;
   }
   
  -#if 0 /* XXX */
   
   /*  _________________________________________________________________
   **
  @@ -115,15 +115,20 @@
    * register us for the mod_log_config function registering phase
    * to establish %{...}c and to be able to expand %{...}x variables.
    */
  -static void ssl_ext_mlc_register(void)
  +static void ssl_ext_mlc_register(apr_pool_t *p)
   {
  -    ap_hook_register("ap::mod_log_config::log_c",
  -                     ssl_ext_mlc_log_c, AP_HOOK_NOCTX);
  -    ap_hook_register("ap::mod_log_config::log_x",
  -                     ssl_ext_mlc_log_x, AP_HOOK_NOCTX);
  +    static APR_OPTIONAL_FN_TYPE(ap_register_log_handler) *log_pfn_register;
  +
  +    log_pfn_register = APR_RETRIEVE_OPTIONAL_FN(ap_register_log_handler);
  +
  +    if (log_pfn_register) {
  +        log_pfn_register(p, "c", ssl_ext_mlc_log_c, 0);
  +        log_pfn_register(p, "x", ssl_ext_mlc_log_x, 0);
  +    }
       return;
   }
   
  +#if 0 /* XXX - We don't really need this (do we???) */
   static void ssl_ext_mlc_unregister(void)
   {
       ap_hook_unregister("ap::mod_log_config::log_c",
  @@ -132,6 +137,7 @@
                          ssl_ext_mlc_log_x);
       return;
   }
  +#endif /* XXX */
   
   /*
    * implement the %{..}c log function
  @@ -141,7 +147,7 @@
   {
       char *result;
   
  -    if (ap_ctx_get(r->connection->client->ctx, "ssl") == NULL)
  +    if (apr_table_get(r->connection->notes, "ssl") == NULL)
           return NULL;
       result = NULL;
       if (strEQ(a, "version"))
  @@ -155,7 +161,7 @@
       else if (strEQ(a, "errcode"))
           result = "-";
       else if (strEQ(a, "errstr"))
  -        result = ap_ctx_get(r->connection->client->ctx, "ssl::verify::error");
  +        result = (char *)apr_table_get(r->connection->notes, "ssl::verify::error");
       if (result != NULL && result[0] == NUL)
           result = NULL;
       return result;
  @@ -170,7 +176,7 @@
       char *result;
   
       result = NULL;
  -    if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL)
  +    if (apr_table_get(r->connection->notes, "ssl") != NULL)
           result = ssl_var_lookup(r->pool, r->server, r->connection, r, a);
       if (result != NULL && result[0] == NUL)
           result = NULL;
  @@ -183,6 +189,7 @@
   **  _________________________________________________________________
   */
   
  +#if 0 /* XXX */
   static char *ssl_ext_mr_lookup_variable(request_rec *r, char *var);
   
   /*
  
  
  

Mime
View raw message