1 files changed, 3 insertions, 50 deletions

diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c
index 5f3a16e..ca4ced7 100644
--- a/mod_log_sql_ssl.c
+++ b/mod_log_sql_ssl.c
@@ -76,58 +76,11 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
         }
 }
 
-#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
+
+LOGSQL_REGISTER(ssl)
 {
         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);
-#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);
+        LOGSQL_REGISTER_RETURN;
 }
-
-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