1 files changed, 61 insertions, 8 deletions

diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c
index 8b792db..c874a2b 100644
--- a/mod_log_sql_ssl.c
+++ b/mod_log_sql_ssl.c
@@ -1,4 +1,5 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/mod_log_sql_ssl.c,v 1.4 2004/01/22 05:26:56 urkle Exp $ */
+/* mod_log_sql_ssl */
 
 #if defined(WITH_APACHE20)
 #       include "apache20.h"
@@ -22,7 +23,6 @@
 #endif
 
 #include "mod_log_sql.h"
-
 #include "mod_ssl.h"
 
 #if defined(WITH_APACHE20)
@@ -37,7 +37,9 @@ static const char *extract_ssl_keysize(request_rec *r, char *a)
         if (TEST_SSL(r) != NULL)
         {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE");
-            log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_KEYSIZE: %s", result);
+                #ifdef DEBUG
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
+                #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -52,7 +54,9 @@ static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
         if (TEST_SSL(r) != NULL) 
         {
                 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE");
-            log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_ALGKEYSIZE: %s", result);
+                #ifdef DEBUG
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
+                #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -67,7 +71,9 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
         if (TEST_SSL(r) != NULL)
         {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER");
-            log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_CIPHER: %s", result);
+                #ifdef DEBUG
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
+                #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -76,11 +82,58 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
         }
 }
 
-
-LOGSQL_REGISTER(ssl)
+#if defined(WITH_APACHE20)
+static int post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
+#elif defined(WITH_APACHE13)
+static void module_init(server_rec *s, apr_pool_t *p)
+#endif
 {
         log_sql_register_item(s,p,'q', extract_ssl_keysize,       "ssl_keysize",      0, 1);
         log_sql_register_item(s,p,'Q', extract_ssl_maxkeysize,    "ssl_maxkeysize",   0, 1);
         log_sql_register_item(s,p,'z', extract_ssl_cipher,        "ssl_cipher",       0, 1);
-        LOGSQL_REGISTER_RETURN;
+#if defined(WITH_APACHE20)
+        return OK;
+#endif
 }
+
+/* The configuration array that sets up the hooks into the module. */
+#if defined(WITH_APACHE20)
+static void register_hooks(apr_pool_t *p) {
+        ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
+}
+
+module AP_MODULE_DECLARE_DATA log_sql_ssl_module = {
+        STANDARD20_MODULE_STUFF,
+        NULL,           /* create per-directory config structures */
+    NULL,               /* merge per-directory config structures */
+    NULL,               /* create per-server config structures */
+    NULL,               /* merge per-server config structures     */
+    NULL,               /* command handlers */
+    register_hooks      /* register hooks */
+};
+#elif defined(WITH_APACHE13)
+module log_sql_ssl_module = {
+        STANDARD_MODULE_STUFF,
+        module_init,                    /* module initializer                           */
+        NULL,                                   /* create per-dir config                        */
+        NULL,                                   /* merge per-dir config                         */
+        NULL,                                   /* create server config                         */
+        NULL,                                   /* merge server config                  */
+        NULL,                   /* config directive table                       */
+        NULL,                                   /* [9] content handlers                         */
+        NULL,                                   /* [2] URI-to-filename translation */
+        NULL,                                   /* [5] check/validate user_id           */
+        NULL,                                   /* [6] check authorization              */
+        NULL,                                   /* [4] check access by host             */
+        NULL,                                   /* [7] MIME type checker/setter         */
+        NULL,                                   /* [8] fixups                                           */
+        NULL,   /* [10] logger                                  */
+        NULL                                    /* [3] header parser                            */
+#if MODULE_MAGIC_NUMBER >= 19970728 /* 1.3-dev or later support these additionals... */
+        ,NULL,   /* child process initializer           */
+        NULL,    /* process exit/cleanup                        */
+        NULL                                     /* [1] post read-request                       */
+#endif
+
+};
+#endif