1 files changed, 532 insertions, 460 deletions

diff --git a/mod_log_sql.c b/mod_log_sql.c
index fc9dcc0..7320f66 100644
--- a/mod_log_sql.c
+++ b/mod_log_sql.c
@@ -1,4 +1,19 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/mod_log_sql.c,v 1.14 2004/02/05 21:59:46 urkle Exp $ */
+/* --------*
+ * DEFINES *
+ * --------*/
+
+/* The enduser may wish to modify this */
+#define DEBUG
+
+/* The enduser won't modify these */
+#define MYSQL_ERROR(mysql) ((mysql)?(mysql_error(mysql)):"MySQL server has gone away")
+
+/* ---------*
+ * INCLUDES *
+ * ---------*/
+#include "mysql.h"
+#include "mysqld_error.h"
 
 #if defined(WITH_APACHE20)
 #       include "apache20.h"
@@ -36,7 +51,7 @@
 #define DEFAULT_HIN_TABLE_NAME          "headers_in"
 #define DEFAULT_HOUT_TABLE_NAME         "headers_out"
 #define DEFAULT_COOKIE_TABLE_NAME       "cookies"
-#define DEFAULT_PRESERVE_FILE           "logs/mod_log_sql-preserve"
+#define DEFAULT_PRESERVE_FILE           "/tmp/sql-preserve"
 
 /* -------------*
  * DECLARATIONS *
@@ -54,11 +69,17 @@ typedef struct {
         int massvirtual;
         int createtables;
         int forcepreserve;
-        int disablepreserve;
+        char *tabletype;
+        char *dbname;
+        char *dbhost;
+        char *dbuser;
+        char *dbpwd;
         char *machid;
-        int announce;
-        logsql_dbconnection db;
-        logsql_dbdriver *driver;
+        char *socketfile;
+        unsigned int tcpport;
+        int insertdelayed;
+        MYSQL server;
+        MYSQL *server_p;
 } global_config_t;
 
 static global_config_t global_config;
@@ -66,11 +87,11 @@ static global_config_t global_config;
 /* structure to hold helper function info */
 typedef struct {
         char key;                                       /* item letter character */
-        logsql_item_func *func; /* its extraction function */
+        log_sql_item_func *func;        /* its extraction function */
         const char *sql_field_name;     /* its column in SQL */
         int want_orig_default;          /* if it requires the original request prior to internal redirection */
         int string_contents;            /* if it returns a string */
-} logsql_item;
+} log_sql_item;
 
 /* But the contents of this structure will vary by virtual server.
  * This permits each virtual server to vary its configuration slightly
@@ -93,28 +114,33 @@ typedef struct {
         const char *transfer_table_name;
         const char *transfer_log_format;
         apr_pool_t *parsed_pool;
-        logsql_item **parsed_log_format;
+        log_sql_item **parsed_log_format;
         const char *preserve_file;
         const char *cookie_name;
 } logsql_state;
 
 
-/* list of "handlers" for log types */
-static apr_array_header_t *logsql_item_list;
+/* -----------------*
+ * HELPER FUNCTIONS *
+ * -----------------*/
+
+static int safe_create_tables(logsql_state *cls, request_rec *r);
 
-/* Registration function for extract functions *
+static apr_array_header_t *log_sql_item_list;
+
+/* Registration Function for extract functions *
  * and update parse cache for transfer_log_format *
  * this is exported from the module */
 LOGSQL_DECLARE(void) log_sql_register_item(server_rec *s, apr_pool_t *p,
-                char key, logsql_item_func *func, const char *sql_field_name,
+                char key, log_sql_item_func *func, const char *sql_field_name,
                 int want_orig_default, int string_contents)
 {
         server_rec *ts;
-        logsql_item *item;
-        if (!logsql_item_list)
-                logsql_item_list = apr_array_make(p,10, sizeof(logsql_item));
+        log_sql_item *item;
+        if (!log_sql_item_list)
+                log_sql_item_list = apr_array_make(p,10, sizeof(log_sql_item));
 
-        item= apr_array_push(logsql_item_list);
+        item= apr_array_push(log_sql_item_list);
         item->key = key;
         item->func = func;
         item->sql_field_name = sql_field_name;
@@ -128,21 +154,14 @@ LOGSQL_DECLARE(void) log_sql_register_item(server_rec *s, apr_pool_t *p,
                 char *pos;
 
                 if (cfg->transfer_log_format) {
-                        if ( (pos = ap_strchr_c(cfg->transfer_log_format,key))!=NULL) {
+                        if ( (pos = strchr(cfg->transfer_log_format,key))!=NULL) {
                                 cfg->parsed_log_format[pos - cfg->transfer_log_format] = item;
                         }
                 }
         }
 }
 
-/* Registration function for database drivers */
-LOGSQL_DECLARE(void) log_sql_register_driver(apr_pool_t *p,
-                logsql_dbdriver *driver)
-{
-        global_config.driver = driver;
-}
-
-/* Include all the core extract functions */
+/* Include all the extract functions */
 #include "functions.h"
 #if defined(WITH_APACHE13)
 #       include "functions13.h"
@@ -150,33 +169,82 @@ LOGSQL_DECLARE(void) log_sql_register_driver(apr_pool_t *p,
 #       include "functions20.h"
 #endif
 
-static logsql_opendb_ret log_sql_opendb_link(server_rec* s)
+/* Routine to escape the 'dangerous' characters that would otherwise
+ * corrupt the INSERT string: ', \, and "
+ */
+static const char *escape_query(const char *from_str, apr_pool_t *p)
 {
-        logsql_opendb_ret result;
-        if (global_config.forcepreserve) {
-                global_config.db.connected = 1;
-                return LOGSQL_OPENDB_PRESERVE;
-        }
-        if (global_config.db.connected) {
-                return LOGSQL_OPENDB_ALREADY;
+        if (!from_str)
+                return NULL;
+        else {
+                char *to_str;
+                unsigned long length = strlen(from_str);
+                unsigned long retval;
+
+                /* Pre-allocate a new string that could hold twice the original, which would only
+                 * happen if the whole original string was 'dangerous' characters.
+                 */
+                to_str = (char *) apr_palloc(p, length * 2 + 1);
+                if (!to_str) {
+                        return from_str;
+                }
+
+                if (!global_config.server_p) {
+                        /* Well, I would have liked to use the current database charset.  mysql is
+                         * unavailable, however, so I fall back to the slightly less respectful
+                         * mysql_escape_string() function that uses the default charset.
+                         */
+                        retval = mysql_escape_string(to_str, from_str, length);
+                } else {
+                        /* MySQL is available, so I'll go ahead and respect the current charset when
+                         * I perform the escape.
+                         */
+                        retval = mysql_real_escape_string(global_config.server_p, to_str, from_str, length);
+                }
+
+                if (retval)
+                  return to_str;
+                else
+                  return from_str;
         }
-        /* database
-                host
-                user
-                passwd
+}
+
+static int open_logdb_link(server_rec* s)
+{
+        /* Returns:
+           3 if preserve forced
+           2 if already connected
+           1 if successful
+           0 if unsuccessful
         */
-        if (global_config.db.parms) {
-                result = global_config.driver->connect(s, &global_config.db);
-                if (result==LOGSQL_OPENDB_FAIL) {
-                        global_config.db.connected = 0;
+
+        if (global_config.forcepreserve)
+                return 3;
+
+        if (global_config.server_p)
+                return 2;
+
+        if ((global_config.dbname) && (global_config.dbhost) && (global_config.dbuser) && (global_config.dbpwd)) {
+                mysql_init(&global_config.server);
+                global_config.server_p = mysql_real_connect(&global_config.server, global_config.dbhost, global_config.dbuser, global_config.dbpwd, global_config.dbname, global_config.tcpport, global_config.socketfile, 0);
+
+                if (global_config.server_p) {
+                        #ifdef DEBUG
+                          log_error(APLOG_MARK,APLOG_DEBUG,s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
+                                                                                                        global_config.dbhost, global_config.tcpport, global_config.dbname, global_config.dbuser, global_config.socketfile);
+                        #endif
+                        return 1;
                 } else {
-                        global_config.db.connected = 1;                 
+                        #ifdef DEBUG
+                          log_error(APLOG_MARK,APLOG_DEBUG,s,"mod_log_sql: database connection error: %s",MYSQL_ERROR(&global_config.server));
+                          log_error(APLOG_MARK,APLOG_DEBUG,s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
+                                                                                                        global_config.dbhost, global_config.tcpport, global_config.dbname, global_config.dbuser, global_config.socketfile);
+                        #endif
+                        return 0;
                 }
-                return result;
         } else {
-                log_error(APLOG_MARK, APLOG_ERR, 0, s,
-                        "mod_log_sql: insufficient configuration info to establish database link");
-                return LOGSQL_OPENDB_FAIL;
+                log_error(APLOG_MARK,APLOG_ERR,s,"mod_log_sql: insufficient configuration info to establish database link");
+                return 0;
         }
 }
 
@@ -194,22 +262,15 @@ static void preserve_entry(request_rec *r, const char *query)
         #if defined(WITH_APACHE20)
                 apr_file_t *fp;
                 apr_status_t result;
+                result = apr_file_open(&fp, cls->preserve_file,APR_APPEND, APR_OS_DEFAULT, r->pool);
         #elif defined(WITH_APACHE13)
                 FILE *fp;
                 int result;
-        #endif
-        /* If preserve file is disabled bail out */
-        if (global_config.disablepreserve)
-       return;
-    #if defined(WITH_APACHE20)
-                result = apr_file_open(&fp, cls->preserve_file,APR_APPEND | APR_WRITE | APR_CREATE, APR_OS_DEFAULT, r->pool);
-    #elif defined(WITH_APACHE13)
                 fp = ap_pfopen(r->pool, cls->preserve_file, "a");
-                result = (fp)?0:errno;
-    #endif
-    if (result != APR_SUCCESS) {
-                log_error(APLOG_MARK, APLOG_ERR, result, r->server,
-                        "attempted append of local preserve file '%s' but failed.",cls->preserve_file);
+                result = (fp)?0:1;
+        #endif
+        if (result != APR_SUCCESS) {
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: attempted append of local preserve file but failed.");
         } else {
                 #if defined(WITH_APACHE20)
                         apr_file_printf(fp,"%s;\n", query);
@@ -218,12 +279,252 @@ static void preserve_entry(request_rec *r, const char *query)
                         fprintf(fp,"%s;\n", query);
                         ap_pfclose(r->pool, fp);
                 #endif
-                log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
-                        "mod_log_sql: entry preserved in %s", cls->preserve_file);
+                #ifdef DEBUG
+                  log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: entry preserved in %s", cls->preserve_file);
+                #endif
         }
 }
 
 
+/*-----------------------------------------------------*
+ * safe_sql_query: perform a database query with       *
+ * a degree of safety and error checking.              *
+ *                                                     *
+ * Parms:   request record, SQL insert statement       *
+ * Returns: 0 (OK) on success                          *
+ *          1 if have no log handle                    *
+ *          2 if insert delayed failed (kluge)         *
+ *          the actual MySQL return code on error      *
+ *-----------------------------------------------------*/
+static unsigned int safe_sql_query(request_rec *r, const char *query)
+{
+        int retval;
+        struct timespec delay, remainder;
+        int ret;
+        void (*handler) (int);
+        logsql_state *cls;
+        unsigned int real_error = 0;
+        const char *real_error_str = NULL;
+
+        /* A failed mysql_query() may send a SIGPIPE, so we ignore that signal momentarily. */
+        handler = signal(SIGPIPE, SIG_IGN);
+
+        /* First attempt for the query */
+        if (!global_config.server_p) {
+                signal(SIGPIPE, handler);
+                return 1;
+        } else if (!(retval = mysql_query(global_config.server_p, query))) {
+                signal(SIGPIPE, handler);
+                return 0;
+        }
+
+        /* If we ran the query and it returned an error, try to be robust.
+        * (After all, the module thought it had a valid mysql_log connection but the query
+        * could have failed for a number of reasons, so we have to be extra-safe and check.) */
+        if (global_config.insertdelayed) {
+         real_error_str = MYSQL_ERROR(global_config.server_p);
+        } else {
+         real_error = mysql_errno(global_config.server_p);
+        }
+
+        /* Check to see if the error is "nonexistent table" */
+        if (global_config.insertdelayed) {
+                retval = (strstr(real_error_str, "Table")) && (strstr(real_error_str,"doesn't exist"));
+        } else {
+                retval = (real_error == ER_NO_SUCH_TABLE);
+        }
+        if (retval) {
+                if (global_config.createtables) {
+                        log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: table doesn't exist...creating now");
+                        cls = ap_get_module_config(r->server->module_config, &log_sql_module);
+                        if (safe_create_tables(cls, r)) {
+                                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: child attempted but failed to create one or more tables for %s, preserving query", ap_get_server_name(r));
+                                preserve_entry(r, query);
+                                retval = mysql_errno(global_config.server_p);
+                        } else {
+                                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: tables successfully created - retrying query");
+                                if (mysql_query(global_config.server_p, query)) {
+                                        log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: giving up, preserving query");
+                                        preserve_entry(r, query);
+                                        retval = mysql_errno(global_config.server_p);
+                                } else
+                                        log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: query successful after table creation");
+                                        retval = 0;
+                        }
+                } else {
+                        log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql, table doesn't exist, creation denied by configuration, preserving query");
+                        preserve_entry(r, query);
+                        retval = ER_NO_SUCH_TABLE;
+                }
+                /* Restore SIGPIPE to its original handler function */
+                signal(SIGPIPE, handler);
+                return retval;
+        }
+
+        /* Handle all other types of errors */
+
+        cls = ap_get_module_config(r->server->module_config, &log_sql_module);
+
+        /* Something went wrong, so start by trying to restart the db link. */
+        if (global_config.insertdelayed) {
+         real_error = 2;
+        } else {
+         real_error = mysql_errno(global_config.server_p);
+        }
+
+        log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: first attempt failed, API said: error %d, \"%s\"", real_error, MYSQL_ERROR(global_config.server_p));
+        mysql_close(global_config.server_p);
+        global_config.server_p = NULL;
+        open_logdb_link(r->server);
+
+        if (global_config.server_p == NULL) {    /* still unable to link */
+                signal(SIGPIPE, handler);
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: reconnect failed, unable to reach database. SQL logging stopped until child regains a db connection.");
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: log entries are being preserved in %s", cls->preserve_file);
+                return 1;
+        } else
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: db reconnect successful");
+
+        /* First sleep for a tiny amount of time. */
+        delay.tv_sec = 0;
+        delay.tv_nsec = 250000000;  /* max is 999999999 (nine nines) */
+        ret = nanosleep(&delay, &remainder);
+        if (ret && errno != EINTR)
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: nanosleep unsuccessful");
+
+        /* Then make our second attempt */
+        retval = mysql_query(global_config.server_p,query);
+
+        /* If this one also failed, log that and append to our local offline file */
+        if (retval)     {
+                if (global_config.insertdelayed) {
+                 real_error = 2;
+                } else {
+                 real_error = mysql_errno(global_config.server_p);
+                }
+
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: second attempt failed, API said: error %d, \"%s\" -- preserving", real_error, MYSQL_ERROR(global_config.server_p));
+                preserve_entry(r, query);
+                retval = real_error;
+        } else
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: second attempt successful");
+
+        /* Restore SIGPIPE to its original handler function */
+        signal(SIGPIPE, handler);
+        return retval;
+}
+
+/*-----------------------------------------------------*
+ * safe_create_tables: create SQL table set for the    *
+ * virtual server represented by cls.                  *
+ *                                                     *
+ * Parms:   virtserver structure, request record       *
+ * Returns: 0 on no errors                                                         *
+ *          mysql error code on failure                            *
+ *-----------------------------------------------------*/
+static int safe_create_tables(logsql_state *cls, request_rec *r)
+{
+        int retval;
+        unsigned int create_results;
+        char *create_access = NULL;
+        char *create_notes = NULL;
+        char *create_hout = NULL;
+        char *create_hin = NULL;
+        char *create_cookies = NULL;
+
+        char *type_suffix = NULL;
+
+        char *createprefix = "create table if not exists `";
+        char *access_suffix =
+         "` (id char(19),\
+       agent varchar(255),\
+       bytes_sent int unsigned,\
+       child_pid smallint unsigned,\
+       cookie varchar(255),\
+           machine_id varchar(25),\
+       request_file varchar(255),\
+       referer varchar(255),\
+       remote_host varchar(50),\
+       remote_logname varchar(50),\
+       remote_user varchar(50),\
+       request_duration smallint unsigned,\
+       request_line varchar(255),\
+       request_method varchar(10),\
+       request_protocol varchar(10),\
+       request_time char(28),\
+       request_uri varchar(255),\
+           request_args varchar(255),\
+       server_port smallint unsigned,\
+       ssl_cipher varchar(25),\
+       ssl_keysize smallint unsigned,\
+       ssl_maxkeysize smallint unsigned,\
+       status smallint unsigned,\
+       time_stamp int unsigned,\
+       virtual_host varchar(255))";
+
+        char *notes_suffix =
+         "` (id char(19),\
+           item varchar(80),\
+           val varchar(80))";
+
+        char *headers_suffix =
+         "` (id char(19),\
+           item varchar(80),\
+       val varchar(80))";
+
+        char *cookies_suffix =
+         "` (id char(19),\
+           item varchar(80),\
+       val varchar(80))";
+        if (global_config.tabletype) {
+                type_suffix = apr_pstrcat(r->pool, " TYPE=", global_config.tabletype, NULL);
+        }
+        /* Find memory long enough to hold the whole CREATE string + \0 */
+        create_access = apr_pstrcat(r->pool, createprefix, cls->transfer_table_name, access_suffix, type_suffix, NULL);
+        create_notes  = apr_pstrcat(r->pool, createprefix, cls->notes_table_name, notes_suffix, type_suffix, NULL);
+        create_hout   = apr_pstrcat(r->pool, createprefix, cls->hout_table_name, headers_suffix, type_suffix, NULL);
+        create_hin    = apr_pstrcat(r->pool, createprefix, cls->hin_table_name, headers_suffix, type_suffix, NULL);
+        create_cookies= apr_pstrcat(r->pool, createprefix, cls->cookie_table_name, cookies_suffix, type_suffix, NULL);
+
+        #ifdef DEBUG
+                log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: create string: %s", create_access);
+                log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: create string: %s", create_notes);
+                log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: create string: %s", create_hout);
+                log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: create string: %s", create_hin);
+                log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: create string: %s", create_cookies);
+        #endif
+
+        /* Assume that things worked unless told otherwise */
+        retval = 0;
+
+        if ((create_results = safe_sql_query(r, create_access))) {
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: failed to create access table");
+                retval = create_results;
+        }
+
+        if ((create_results = safe_sql_query(r, create_notes))) {
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: failed to create notes table");
+                retval = create_results;
+        }
+
+        if ((create_results = safe_sql_query(r, create_hin))) {
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: failed to create header_in table");
+                retval = create_results;
+        }
+
+        if ((create_results = safe_sql_query(r, create_hout))) {
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: failed to create header_out table");
+                retval = create_results;
+        }
+
+        if ((create_results = safe_sql_query(r, create_cookies))) {
+                log_error(APLOG_MARK,APLOG_ERR,r->server,"mod_log_sql: failed to create cookies table");
+                retval = create_results;
+        }
+
+        return retval;
+}
+
 /* ------------------------------------------------*
  * Command handlers that are called according      *
  * to the directives found at Apache runtime.      *
@@ -266,6 +567,7 @@ static const char *set_global_string_slot(cmd_parms *cmd,
     *(const char **)((char *)ptr + offset) = apr_pstrdup(cmd->pool,arg);
     return NULL;
 }
+
 static const char *set_server_string_slot(cmd_parms *cmd,
                                                  void *struct_ptr,
                                                  const char *arg)
@@ -279,27 +581,6 @@ static const char *set_server_string_slot(cmd_parms *cmd,
     return NULL;
 }
 
-static const char *set_server_file_slot(cmd_parms *cmd,
-                                                 void *struct_ptr,
-                                                 const char *arg)
-{
-        void *ptr = ap_get_module_config(cmd->server->module_config,
-                        &log_sql_module);
-        int offset = (int)(long)cmd->info;
-    const char *path;
-
-    path = ap_server_root_relative(cmd->pool, (char *)arg);
-                            
-    if (!path) {
-        return apr_pstrcat(cmd->pool, "Invalid file path ",
-                           arg, NULL);
-    }
-    
-    *(const char **)((char*)ptr + offset) = path;
-    
-    return NULL;
-}
-
 static const char *set_logformat_slot(cmd_parms *cmd,
                                                  void *struct_ptr,
                                                  const char *arg)
@@ -310,7 +591,7 @@ static const char *set_logformat_slot(cmd_parms *cmd,
         cfg->transfer_log_format = arg;
 /*      apr_pool_clear(cfg->parsed_pool);*/
         cfg->parsed_log_format = apr_pcalloc(cfg->parsed_pool,
-                strlen(arg) * sizeof(logsql_item *));
+                strlen(arg) * sizeof(log_sql_item *));
     return NULL;
 }
 
@@ -326,69 +607,16 @@ static const char *set_server_nmv_string_slot(cmd_parms *parms,
                 return set_server_string_slot(parms,struct_ptr,arg);
 }
 
-/* Set a DB connection parameter */
-static const char *set_dbparam(cmd_parms *cmd,
-                                                                void *struct_ptr,
-                                                                const char *key,
-                                                                const char *val)
+static const char *set_log_sql_info(cmd_parms *cmd, void *dummy, const char *host, const char *user, const char *pwd)
 {
-        if (!global_config.db.parms) {
-                global_config.db.parms = apr_table_make(cmd->pool,5);
+        if (*host != '.') {
+                global_config.dbhost = apr_pstrdup(cmd->pool,host);
         }
-        apr_table_set(global_config.db.parms,key,val);
-        return NULL;
-}
-
-static const char *set_dbparam_slot(cmd_parms *cmd,
-                                                                void *struct_ptr,
-                                                                const char *arg)
-{
-        const char *param = (char *)cmd->info;
-        set_dbparam(cmd,NULL,param,arg);
-        return NULL;
-}
-
-/* Sets basic connection info */
-static const char *set_log_sql_info(cmd_parms *cmd, void *dummy, 
-                                                const char *host, const char *user, const char *pwd)
-{
-        if (!user) { /* user is null, so only one arg passed */
-            /* TODO: to more error checking/force all params to be set */
-                apr_uri_t uri;
-                apr_uri_parse(cmd->pool, host, &uri);
-                if (uri.scheme) {
-                        set_dbparam(cmd, NULL, "driver", uri.scheme);
-                }
-                if (uri.hostname) {
-                        set_dbparam(cmd, NULL, "hostname", uri.hostname);
-                }
-                if (uri.user) {
-                        set_dbparam(cmd, NULL, "username", uri.user);
-                }
-                if (uri.password) {
-                        set_dbparam(cmd, NULL, "password", uri.password);
-                }
-                if (uri.port_str) {
-                        set_dbparam(cmd, NULL, "port", uri.port_str);
-                }
-                if (uri.path) {
-                        /* extract Database name */
-                        char *off = ap_strchr(++uri.path,'/');
-                        if (off)
-                                *off='\0';
-                        set_dbparam(cmd, NULL, "database", uri.path);
-                        
-                }
-        } else {
-                if (*host != '.') {
-                        set_dbparam(cmd, NULL, "hostname", host);
-                }
-                if (*user != '.') {
-                        set_dbparam(cmd, NULL, "username", user);
-                }
-                if (*pwd != '.') {
-                        set_dbparam(cmd, NULL, "password", pwd);
-                }
+        if (*user != '.') {
+                global_config.dbuser = apr_pstrdup(cmd->pool,user);
+        }
+        if (*pwd != '.') {
+                global_config.dbpwd = apr_pstrdup(cmd->pool,pwd);
         }
         return NULL;
 }
@@ -401,13 +629,20 @@ static const char *add_server_string_slot(cmd_parms *cmd,
         void *ptr = ap_get_module_config(cmd->server->module_config,
                         &log_sql_module);
         int offset = (int)(long)cmd->info;
-        apr_array_header_t *ary = *(apr_array_header_t **)((char *)ptr + offset);
+        apr_array_header_t *ary = *(apr_array_header_t **)(ptr + offset);
         addme = apr_array_push(ary);
         *addme = apr_pstrdup(ary->pool, arg);
             
     return NULL;
 }
 
+static const char *set_log_sql_tcp_port(cmd_parms *parms, void *dummy, const char *arg)
+{
+        global_config.tcpport = (unsigned int)atoi(arg);
+
+        return NULL;
+}
+
 /*------------------------------------------------------------*
  * Apache-specific hooks into the module code                 *
  * that are defined in the array 'mysql_lgog_module' (at EOF) *
@@ -416,47 +651,59 @@ static const char *add_server_string_slot(cmd_parms *cmd,
 #if defined(WITH_APACHE20)
 static apr_status_t log_sql_close_link(void *data)
 {
-        global_config.driver->disconnect(&global_config.db);
+        mysql_close(global_config.server_p);
         return APR_SUCCESS;
 }
 #elif defined(WITH_APACHE13)
 static void log_sql_child_exit(server_rec *s, apr_pool_t *p)
 {
-        global_config.driver->disconnect(&global_config.db);
+        mysql_close(global_config.server_p);
 }
 #endif
 
 /* Child Init */
 #if defined(WITH_APACHE20)
 static void log_sql_child_init(apr_pool_t *p, server_rec *s)
+{
+        apr_pool_cleanup_register(p, NULL, log_sql_close_link, log_sql_close_link);
+}
+
+static int log_sql_open(apr_pool_t *pc, apr_pool_t *p, apr_pool_t *pt, server_rec *s)
 #elif defined(WITH_APACHE13)
 static void log_sql_child_init(server_rec *s, apr_pool_t *p)
 #endif
 {
-        logsql_opendb_ret retval;
-#       if defined(WITH_APACHE20)
-        /* Register cleanup hook to close DDB connection (apache 2 doesn't have child_exit) */
-        apr_pool_cleanup_register(p, NULL, log_sql_close_link, log_sql_close_link);
-#       endif
-        /* Open a link to the database */
-        retval = log_sql_opendb_link(s);
-        switch (retval) {
-        case LOGSQL_OPENDB_FAIL:
-                log_error(APLOG_MARK, APLOG_ERR, 0, s,
-                        "mod_log_sql: child spawned but unable to open database link");
-                break;
-        case LOGSQL_OPENDB_SUCCESS:
-        case LOGSQL_OPENDB_ALREADY:
-                log_error(APLOG_MARK,APLOG_DEBUG,0, s,
-                        "mod_log_sql: open_logdb_link successful");
-                break;
-        case LOGSQL_OPENDB_PRESERVE:
-                log_error(APLOG_MARK,APLOG_DEBUG, 0, s,
-                        "mod_log_sql: open_logdb_link said that preservation is forced");
-                break;
-        }
+        int retval;
+                /* Open a link to the database */
+        retval = open_logdb_link(s);
+        if (!retval)
+                log_error(APLOG_MARK,APLOG_ERR,s,"mod_log_sql: child spawned but unable to open database link");
+
+        #ifdef DEBUG
+        if ( (retval == 1) || (retval == 2) )
+                log_error(APLOG_MARK,APLOG_DEBUG,s,"mod_log_sql: open_logdb_link successful");
+        if (retval == 3)
+                log_error(APLOG_MARK,APLOG_DEBUG,s,"mod_log_sql: open_logdb_link said that preservation is forced");
+        #endif
+#if defined(WITH_APACHE20)
+        return OK;
+#endif
 }
+/*
+void *log_sql_initializer(server_rec *main_server, apr_pool_t *p)
+{
+        server_rec *s;
+
+    logsql_state main_conf = ap_get_module_config(main_server->module_config, &log_sql_module);
+
+        for (server_rec *s = main_server; s; s = s->next) {
+            conf = ap_get_module_config(s->module_config, &log_sql_module);
+            if (conf->transfer_log_format == NULL && s != main_server) {
+                *conf = *main_conf;
+                }
 
+}
+ */
 /* post_config / module_init */
 #if defined(WITH_APACHE20)
 static int log_sql_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
@@ -464,6 +711,12 @@ static int log_sql_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptem
 static void log_sql_module_init(server_rec *s, apr_pool_t *p)
 #endif
 {
+        /* Initialize Global configuration */
+        if (!global_config.socketfile)
+                global_config.socketfile = "/tmp/mysql.sock";
+        if (!global_config.tcpport)
+                global_config.tcpport = 3306;
+
         /* TODO: Add local_address, remote_address, server_name, connection_status */
         /* Register handlers */
         log_sql_register_item(s,p,'A', extract_agent,             "agent",            1, 1);
@@ -490,136 +743,11 @@ static void log_sql_module_init(server_rec *s, apr_pool_t *p)
         log_sql_register_item(s,p,'U', extract_request_uri,       "request_uri",      1, 1);
         log_sql_register_item(s,p,'v', extract_virtual_host,      "virtual_host",     0, 1);
 
-        if (global_config.announce) {
-                ap_add_version_component(p, PACKAGE_NAME"/"PACKAGE_VERSION);
-        }
-        /* ap_server_root_relative any default preserve file locations */
-        {
-            server_rec *cur_s;
-            const char *default_p = ap_server_root_relative(p, DEFAULT_PRESERVE_FILE);
-            for (cur_s = s; cur_s != NULL; cur_s= cur_s->next) {
-             logsql_state *cls = ap_get_module_config(cur_s->module_config,
-                                                                        &log_sql_module);
-             if (cls->preserve_file == DEFAULT_PRESERVE_FILE)
-                 cls->preserve_file = default_p;
-            }
-        }
 #if defined(WITH_APACHE20)
         return OK;
 #endif
 }
 
-/* This function handles calling the DB module,  handling errors 
- * of missing tables and lost DB connections, and falling back to 
- * preserving the DB query.
- *
- * Parms: request record, table type, table name, and the full SQL command
- */
-
-static logsql_query_ret safe_sql_insert(request_rec *r, logsql_tabletype table_type,
-                const char *table_name, const char *query) {
-
-        logsql_query_ret result;
-        logsql_state *cls = ap_get_module_config(r->server->module_config,
-                                                                        &log_sql_module);
-
-        if (!global_config.db.connected) {
-                /* preserve query */
-                return LOGSQL_QUERY_NOLINK;
-        }
-
-        result = global_config.driver->insert(r,&global_config.db,query);
-
-        /* If we ran the query and it returned an error, try to be robust.
-        * (After all, the module thought it had a valid mysql_log connection but the query
-        * could have failed for a number of reasons, so we have to be extra-safe and check.) */
-        switch (result) {
-        case LOGSQL_QUERY_SUCCESS:
-                return LOGSQL_QUERY_SUCCESS;
-        case LOGSQL_QUERY_NOLINK:
-                return LOGSQL_QUERY_FAIL;
-                /* TODO: What do we do here */
-        case LOGSQL_QUERY_FAIL:
-                global_config.driver->disconnect(&global_config.db);
-                global_config.db.connected = 0;
-                /* re-open the connection and try again */
-                if (log_sql_opendb_link(r->server) != LOGSQL_OPENDB_FAIL) {
-                        log_error(APLOG_MARK,APLOG_NOTICE,0, r->server,"db reconnect successful");
-#                       if defined(WITH_APACHE20)
-                        apr_sleep(apr_time_from_sec(0.25)); /* pause for a quarter second */
-#                       elif defined(WITH_APACHE13)
-#            if defined(WIN32)
-            Sleep((DWORD)0.25);
-#            else
-                        {
-                                struct timespec delay, remainder;
-                                int nanoret;
-                                delay.tv_sec = 0;
-                                delay.tv_nsec = 250000000; /* pause for a quarter second */
-                                nanoret = nanosleep(&delay, &remainder);
-                                if (nanoret && errno != EINTR) {
-                                        log_error(APLOG_MARK,APLOG_ERR, errno, r->server,"nanosleep unsuccessful");
-                                }
-                        }
-#                        endif /* win32 */
-#                       endif
-                        result = global_config.driver->insert(r,&global_config.db,query);
-                        if (result == LOGSQL_QUERY_SUCCESS) {
-                                return LOGSQL_QUERY_SUCCESS;
-                        } else {
-                                log_error(APLOG_MARK,APLOG_ERR,0,r->server,"second attempt failed");
-                                preserve_entry(r, query);
-                                return LOGSQL_QUERY_PRESERVED;
-                        }
-                } else {
-                        log_error(APLOG_MARK,APLOG_ERR,0,r->server,
-                                "reconnect failed, unable to reach database. SQL logging stopped until child regains a db connection.");
-                        log_error(APLOG_MARK,APLOG_ERR,0,r->server,
-                                "log entries are being preserved in %s",cls->preserve_file);
-                        preserve_entry(r, query);
-                        return LOGSQL_QUERY_PRESERVED;
-                }
-                break;
-        case LOGSQL_QUERY_NOTABLE:
-                if (global_config.createtables) {
-                        log_error(APLOG_MARK,APLOG_ERR,0,r->server,
-                                        "table doesn't exist...creating now");
-                        if ((result = global_config.driver->create_table(r, &global_config.db, table_type, 
-                                table_name))!=LOGSQL_TABLE_SUCCESS) {
-                                log_error(APLOG_MARK,APLOG_ERR,result,r->server,
-                                        "child attempted but failed to create one or more tables for %s, preserving query", ap_get_server_name(r));
-                                preserve_entry(r, query);
-                                return LOGSQL_QUERY_PRESERVED;
-                        } else {
-                                log_error(APLOG_MARK,APLOG_ERR,result, r->server,
-                                        "tables successfully created - retrying query");
-                                if ((result = global_config.driver->insert(r,&global_config.db,query))!=LOGSQL_QUERY_SUCCESS) {
-                                        log_error(APLOG_MARK,APLOG_ERR,result, r->server,
-                                                "giving up, preserving query");
-                                        preserve_entry(r, query);
-                                        return LOGSQL_QUERY_PRESERVED;
-                                } else {
-                                        log_error(APLOG_MARK,APLOG_NOTICE,0, r->server,
-                                                "query successful after table creation");
-                                        return LOGSQL_QUERY_SUCCESS;
-                                }
-                        }
-                } else {
-                        log_error(APLOG_MARK,APLOG_ERR,0,r->server,
-                                "table doesn't exist, creation denied by configuration, preserving query");
-                        preserve_entry(r, query);
-                        return LOGSQL_QUERY_PRESERVED;
-                }
-                break;
-        default:
-                log_error(APLOG_MARK,APLOG_ERR,0, r->server,
-                                "Invalid return code from mog_log_query");
-                return LOGSQL_QUERY_FAIL;
-                break;
-        }
-        return LOGSQL_QUERY_FAIL;
-}
-
 /* This function gets called to create a per-server configuration
  * record.  It will always be called for the main server and
  * for each virtual server that is established.  Each server maintains
@@ -636,7 +764,7 @@ static void *log_sql_make_state(apr_pool_t *p, server_rec *s)
         cls->transfer_log_format = DEFAULT_TRANSFER_LOG_FMT;
         apr_pool_create(&cls->parsed_pool, p);
         cls->parsed_log_format = apr_pcalloc(cls->parsed_pool,
-                        strlen(cls->transfer_log_format) * sizeof(logsql_item *));
+                        strlen(cls->transfer_log_format) * sizeof(log_sql_item *));
         cls->notes_table_name = DEFAULT_NOTES_TABLE_NAME;
         cls->hin_table_name = DEFAULT_HIN_TABLE_NAME;
         cls->hout_table_name = DEFAULT_HOUT_TABLE_NAME;
@@ -654,92 +782,31 @@ static void *log_sql_make_state(apr_pool_t *p, server_rec *s)
         return (void *) cls;
 }
 
-
-/* Iterates through an array of char* and searches for a matching element
- * Returns 0 if not found, 1 if found */
-static int in_array(apr_array_header_t *ary, const char *elem)
-{
-        int itr;
-        for (itr = 0; itr < ary->nelts; itr++) {
-                if (!strcmp(elem,((char **)ary->elts)[itr])) {
-                        return 1;
-                }
-        }
-        return 0;
-}
-
-
-/* Parse through cookie lists and merge based on +/- prefixes */
-#define DO_MERGE_ARRAY(parent,child,pool) \
-if (apr_is_empty_array(child)) { \
-        apr_array_cat(child, parent); \
-} else { \
-        apr_array_header_t *addlist, *dellist; \
-        char **elem, **ptr = (char **)(child->elts); \
-        int itr, overwrite = 0; \
-        addlist = apr_array_make(pool,5,sizeof(char *)); \
-        dellist = apr_array_make(subp,5,sizeof(char *)); \
-\
-        for (itr=0; itr<child->nelts; itr++) { \
-                if (*ptr[itr] == '+') { \
-                        elem = (char **)apr_array_push(addlist); \
-                        *elem = (ptr[itr]+1); \
-                } else if (*ptr[itr] == '-') { \
-                        elem = (char **)apr_array_push(dellist); \
-                        *elem = (ptr[itr]+1); \
-                } else { \
-                        overwrite = 1; \
-                        elem = (char **)apr_array_push(addlist); \
-                        *elem = ptr[itr]; \
-                } \
-        } \
-        child = apr_array_make(p,1,sizeof(char *)); \
-        ptr = (char **)(parent->elts); \
-        if (overwrite==0) { \
-                /* if we are not overwriting the existing then prepare for merge */ \
-                for (itr=0; itr<parent->nelts; itr++) { \
-                        if (!in_array(addlist, ptr[itr]) && !in_array(dellist,ptr[itr])) { \
-                                elem = apr_array_push(child); \
-                                *elem = apr_pstrdup(p, ptr[itr]); \
-                        } \
-                } \
-        } \
-        apr_array_cat(child, addlist); \
-}
-
 static void *log_sql_merge_state(apr_pool_t *p, void *basev, void *addv)
 {
         /* Fetch the two states to merge */
         logsql_state *parent = (logsql_state *) basev;
         logsql_state *child = (logsql_state *) addv;
 
-        apr_pool_t *subp;
-
-        apr_pool_create(&subp,p);
-
         /* Child can override these, otherwise they default to parent's choice.
          * If the parent didn't set them, create reasonable defaults for the
          * ones that should have such default settings.  Leave the others null. */
 
+        child->transfer_table_name = child->transfer_table_name ?
+                                child->transfer_table_name : parent->transfer_table_name;
         /* No default for transfer_table_name because we want its absence
          * to disable logging. */
-        if (!child->transfer_table_name) {
-                child->transfer_table_name = parent->transfer_table_name;
-        }
 
         if (child->transfer_log_format == DEFAULT_TRANSFER_LOG_FMT) {
                 child->transfer_log_format = parent->transfer_log_format;
                 /*apr_pool_clear(child->parsed_pool);*/
                 child->parsed_log_format = apr_pcalloc(child->parsed_pool,
-                        strlen(child->transfer_log_format) * sizeof(logsql_item *));
+                        strlen(child->transfer_log_format) * sizeof(log_sql_item *));
         }
 
         if (child->preserve_file == DEFAULT_PRESERVE_FILE)
                 child->preserve_file = parent->preserve_file;
-        /* server_root_relative the preserve file location */
-        if (child->preserve_file == DEFAULT_PRESERVE_FILE)
-        child->preserve_file = ap_server_root_relative(p, DEFAULT_PRESERVE_FILE);
- 
+
         if (child->notes_table_name == DEFAULT_NOTES_TABLE_NAME)
                 child->notes_table_name = parent->notes_table_name;
 
@@ -752,20 +819,30 @@ static void *log_sql_merge_state(apr_pool_t *p, void *basev, void *addv)
         if (child->cookie_table_name == DEFAULT_COOKIE_TABLE_NAME)
                 child->cookie_table_name = parent->cookie_table_name;
 
-        DO_MERGE_ARRAY(parent->transfer_ignore_list, child->transfer_ignore_list, subp);
-        DO_MERGE_ARRAY(parent->transfer_accept_list, child->transfer_accept_list, subp);
-        DO_MERGE_ARRAY(parent->remhost_ignore_list, child->remhost_ignore_list, subp);
-        DO_MERGE_ARRAY(parent->notes_list, child->notes_list, subp);
-        DO_MERGE_ARRAY(parent->hin_list, child->hin_list, subp);
-        DO_MERGE_ARRAY(parent->hout_list, child->hout_list, subp);
-        DO_MERGE_ARRAY(parent->cookie_list,child->cookie_list, subp);
+        if (apr_is_empty_array(child->transfer_ignore_list))
+                apr_array_cat(child->transfer_ignore_list, parent->transfer_ignore_list);
+
+        if (apr_is_empty_array(child->transfer_accept_list))
+                apr_array_cat(child->transfer_accept_list, parent->transfer_accept_list);
+
+        if (apr_is_empty_array(child->remhost_ignore_list))
+                apr_array_cat(child->remhost_ignore_list, parent->remhost_ignore_list);
 
-        apr_pool_destroy(subp);
+        if (apr_is_empty_array(child->notes_list))
+                apr_array_cat(child->notes_list, parent->notes_list);
+
+        if (apr_is_empty_array(child->hin_list))
+                apr_array_cat(child->hin_list, parent->hin_list);
+
+        if (apr_is_empty_array(child->hout_list))
+                apr_array_cat(child->hout_list, parent->hout_list);
+
+        if (apr_is_empty_array(child->cookie_list))
+                apr_array_cat(child->cookie_list, parent->cookie_list);
 
         if (!child->cookie_name)
                 child->cookie_name = parent->cookie_name;
 
-
         return (void*) child;
 }
 
@@ -850,7 +927,7 @@ static int log_sql_transaction(request_rec *orig)
                 if ((r->uri) && (cls->transfer_accept_list->nelts)) {
                         proceed = 0;
                         for (ptrptr = (char **) cls->transfer_accept_list->elts; ptrptr < ptrptr2; ptrptr = (char **) ((char *) ptrptr + cls->transfer_accept_list->elt_size))
-                                if (ap_strstr(r->uri, *ptrptr)) {
+                                if (strstr(r->uri, *ptrptr)) {
                                         proceed = 1;
                                         break;
                                 }
@@ -863,7 +940,7 @@ static int log_sql_transaction(request_rec *orig)
                 ptrptr2 = (char **) (cls->transfer_ignore_list->elts + (cls->transfer_ignore_list->nelts * cls->transfer_ignore_list->elt_size));
                 if (r->uri) {
                         for (ptrptr = (char **) cls->transfer_ignore_list->elts; ptrptr < ptrptr2; ptrptr = (char **) ((char *) ptrptr + cls->transfer_ignore_list->elt_size))
-                                if (ap_strstr(r->uri, *ptrptr)) {
+                                if (strstr(r->uri, *ptrptr)) {
                                         return OK;
                                 }
                 }
@@ -874,7 +951,7 @@ static int log_sql_transaction(request_rec *orig)
                 thehost = ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL);
                 if (thehost) {
                         for (ptrptr = (char **) cls->remhost_ignore_list->elts; ptrptr < ptrptr2; ptrptr = (char **) ((char *) ptrptr + cls->remhost_ignore_list->elt_size))
-                                if (ap_strstr(thehost, *ptrptr)) {
+                                if (strstr(thehost, *ptrptr)) {
                                         return OK;
                                 }
                 }
@@ -884,9 +961,9 @@ static int log_sql_transaction(request_rec *orig)
                  * what the user has configured. */
                 length = strlen(cls->transfer_log_format);
                 for (i = 0; i<length; i++) {
-                        logsql_item *item = cls->parsed_log_format[i];
+                        log_sql_item *item = cls->parsed_log_format[i];
                         if (item==NULL) {
-                                log_error(APLOG_MARK, APLOG_ERR, 0, orig->server,
+                                log_error(APLOG_MARK, APLOG_ERR, orig->server,
                                         "Log Format '%c' unknown",cls->transfer_log_format[i]);
                                 continue;
                         }
@@ -909,7 +986,7 @@ static int log_sql_transaction(request_rec *orig)
                                                  item->sql_field_name, NULL);
                         values = apr_pstrcat(r->pool, values, (i ? "," : ""),
                                                  (item->string_contents ? "'" : ""),
-                                             global_config.driver->escape(formatted_item, r->pool,&global_config.db),
+                                             escape_query(formatted_item, r->pool),
                                                  (item->string_contents ? "'" : ""), NULL);
                 }
 
@@ -926,9 +1003,9 @@ static int log_sql_transaction(request_rec *orig)
                                                                           "('",
                                                                           unique_id,
                                                                           "','",
-                                                                          global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+                                                                          escape_query(*ptrptr, r->pool),
                                                                           "','",
-                                                                          global_config.driver->escape(theitem, r->pool,&global_config.db),
+                                                                          escape_query(theitem, r->pool),
                                                                           "')",
                                                                           NULL);
                                 i++;
@@ -936,9 +1013,11 @@ static int log_sql_transaction(request_rec *orig)
                 }
                 if ( itemsets != "" ) {
                         note_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s",
-                                /*global_config.insertdelayed?"delayed":*/"", notes_tablename, itemsets);
+                                global_config.insertdelayed?"delayed":"", notes_tablename, itemsets);
 
-                        log_error(APLOG_MARK,APLOG_DEBUG,0, orig->server,"mod_log_sql: note string: %s", note_query);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: note string: %s", note_query);
+                        #endif
                 }
 
                 /* Work through the list of headers-out defined by LogSQLWhichHeadersOut*/
@@ -954,9 +1033,9 @@ static int log_sql_transaction(request_rec *orig)
                                                                           "('",
                                                                           unique_id,
                                                                           "','",
-                                                                          global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+                                                                          escape_query(*ptrptr, r->pool),
                                                                           "','",
-                                                                          global_config.driver->escape(theitem, r->pool,&global_config.db),
+                                                                          escape_query(theitem, r->pool),
                                                                           "')",
                                                                           NULL);
                                 i++;
@@ -964,9 +1043,11 @@ static int log_sql_transaction(request_rec *orig)
                 }
                 if ( itemsets != "" ) {
                         hout_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s",
-                                /*global_config.insertdelayed?"delayed":*/"", hout_tablename, itemsets);
+                                global_config.insertdelayed?"delayed":"", hout_tablename, itemsets);
 
-                        log_error(APLOG_MARK,APLOG_DEBUG,0, orig->server,"mod_log_sql: header_out string: %s", hout_query);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: header_out string: %s", hout_query);
+                        #endif
                 }
 
 
@@ -983,9 +1064,9 @@ static int log_sql_transaction(request_rec *orig)
                                                                           "('",
                                                                           unique_id,
                                                                           "','",
-                                                                          global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+                                                                          escape_query(*ptrptr, r->pool),
                                                                           "','",
-                                                                          global_config.driver->escape(theitem, r->pool,&global_config.db),
+                                                                          escape_query(theitem, r->pool),
                                                                           "')",
                                                                           NULL);
                                 i++;
@@ -993,9 +1074,11 @@ static int log_sql_transaction(request_rec *orig)
                 }
                 if ( itemsets != "" ) {
                         hin_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s",
-                                /*global_config.insertdelayed?"delayed":*/"", hin_tablename, itemsets);
+                                global_config.insertdelayed?"delayed":"", hin_tablename, itemsets);
 
-                        log_error(APLOG_MARK,APLOG_DEBUG,0, orig->server,"mod_log_sql: header_in string: %s", hin_query);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: header_in string: %s", hin_query);
+                        #endif
                 }
 
 
@@ -1012,9 +1095,9 @@ static int log_sql_transaction(request_rec *orig)
                                                                           "('",
                                                                           unique_id,
                                                                           "','",
-                                                                          global_config.driver->escape(*ptrptr, r->pool,&global_config.db),
+                                                                          escape_query(*ptrptr, r->pool),
                                                                           "','",
-                                                                          global_config.driver->escape(theitem, r->pool,&global_config.db),
+                                                                          escape_query(theitem, r->pool),
                                                                           "')",
                                                                           NULL);
                                 i++;
@@ -1023,23 +1106,29 @@ static int log_sql_transaction(request_rec *orig)
                 }
                 if ( itemsets != "" ) {
                         cookie_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s",
-                                /*global_config.insertdelayed?"delayed":*/"", cookie_tablename, itemsets);
+                                global_config.insertdelayed?"delayed":"", cookie_tablename, itemsets);
 
-                        log_error(APLOG_MARK,APLOG_DEBUG,0, orig->server,"mod_log_sql: cookie string: %s", cookie_query);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: cookie string: %s", cookie_query);
+                        #endif
                 }
 
 
                 /* Set up the actual INSERT statement */
                 access_query = apr_psprintf(r->pool, "insert %s into `%s` (%s) values (%s)",
-                        /*global_config.insertdelayed?"delayed":*/"", transfer_tablename, fields, values);
+                        global_config.insertdelayed?"delayed":"", transfer_tablename, fields, values);
 
-        log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"mod_log_sql: access string: %s", access_query);
+                #ifdef DEBUG
+                log_error(APLOG_MARK,APLOG_DEBUG,r->server,"mod_log_sql: access string: %s", access_query);
+            #endif
 
                 /* If the person activated force-preserve, go ahead and push all the entries
                  * into the preserve file, then return.
                  */
                 if (global_config.forcepreserve) {
-                        log_error(APLOG_MARK,APLOG_DEBUG,0, orig->server,"mod_log_sql: preservation forced");
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: preservation forced");
+                        #endif
                         preserve_entry(orig, access_query);
                         if ( note_query != NULL )
                                 preserve_entry(orig, note_query);
@@ -1053,12 +1142,12 @@ static int log_sql_transaction(request_rec *orig)
                 }
 
                 /* How's our mysql link integrity? */
-                if (!global_config.db.connected) {
+                if (global_config.server_p == NULL) {
 
                         /* Make a try to establish the link */
-                        log_sql_opendb_link(r->server);
+                        open_logdb_link(r->server);
 
-                        if (!global_config.db.connected) {
+                        if (global_config.server_p == NULL) {
                                 /* Unable to re-establish a DB link, so assume that it's really
                                  * gone and send the entry to the preserve file instead.
                                  * This short-circuits safe_sql_query() during a db outage and therefore
@@ -1077,7 +1166,7 @@ static int log_sql_transaction(request_rec *orig)
                                 return OK;
                         } else {
                                 /* Whew, we got the DB link back */
-                                log_error(APLOG_MARK,APLOG_NOTICE,0, orig->server,"mod_log_sql: child established database connection");
+                                log_error(APLOG_MARK,APLOG_NOTICE,orig->server,"mod_log_sql: child established database connection");
                         }
                 }
 
@@ -1086,20 +1175,20 @@ static int log_sql_transaction(request_rec *orig)
                 /* ---> i.e. we have a good MySQL connection.                <--- */
 
             /* Make the access-table insert */
-                safe_sql_insert(orig,LOGSQL_TABLE_ACCESS,transfer_tablename,access_query);
+                safe_sql_query(orig, access_query);
 
                 /* Log the optional notes, headers, etc. */
                 if (note_query)
-                        safe_sql_insert(orig, LOGSQL_TABLE_NOTES,notes_tablename,note_query);
+                        safe_sql_query(orig, note_query);
 
                 if (hout_query)
-                        safe_sql_insert(orig, LOGSQL_TABLE_HEADERSOUT,hout_tablename,hout_query);
+                        safe_sql_query(orig, hout_query);
 
                 if (hin_query)
-                        safe_sql_insert(orig, LOGSQL_TABLE_HEADERSIN,hin_tablename,hin_query);
+                        safe_sql_query(orig, hin_query);
 
                 if (cookie_query)
-                        safe_sql_insert(orig, LOGSQL_TABLE_COOKIES,cookie_tablename,cookie_query);
+                        safe_sql_query(orig, cookie_query);
 
                 return OK;
         }
@@ -1110,38 +1199,6 @@ static int log_sql_transaction(request_rec *orig)
  * Structure: command, function called, NULL, where available, how many arguments, verbose description
  */
 static const command_rec log_sql_cmds[] = {
-        AP_INIT_FLAG("LogSQLAnnounce", set_global_flag_slot,
-         (void *)APR_OFFSETOF(global_config_t, announce), RSRC_CONF,
-         "Whether to announce that mod_log_sql is loaded in the server header")
-        ,
-        /* DB connection parameters */
-        AP_INIT_TAKE13("LogSQLLoginInfo", set_log_sql_info, NULL, RSRC_CONF,
-         "The database connection URI in the form &quot;driver://user:password@hostname:port/database&quot;")
-        ,
-        AP_INIT_TAKE2("LogSQLDBParam", set_dbparam, NULL, RSRC_CONF,
-         "First argument is the DB parameter, second is the value to assign")
-        ,
-        AP_INIT_FLAG("LogSQLForcePreserve", set_global_flag_slot,
-         (void *)APR_OFFSETOF(global_config_t, forcepreserve), RSRC_CONF,
-         "Forces logging to preserve file and bypasses database")
-        ,
-        AP_INIT_FLAG("LogSQLDisablePreserve", set_global_flag_slot,
-         (void *)APR_OFFSETOF(global_config_t, disablepreserve), RSRC_CONF,
-         "Completely disables use of the preserve file")
-        ,
-        AP_INIT_TAKE1("LogSQLPreserveFile", set_server_file_slot,
-         (void *)APR_OFFSETOF(logsql_state,preserve_file), RSRC_CONF,
-         "Name of the file to use for data preservation during database downtime")
-        ,
-        AP_INIT_FLAG("LogSQLCreateTables", set_global_nmv_flag_slot, 
-         (void *)APR_OFFSETOF(global_config_t, createtables), RSRC_CONF,
-         "Turn on module's capability to create its SQL tables on the fly")
-        ,
-        /* Table names */
-        AP_INIT_FLAG("LogSQLMassVirtualHosting", set_global_flag_slot,
-         (void *)APR_OFFSETOF(global_config_t, massvirtual), RSRC_CONF,
-         "Activates option(s) useful for ISPs performing mass virutal hosting")
-        ,
         AP_INIT_TAKE1("LogSQLTransferLogTable", set_server_nmv_string_slot,
          (void *)APR_OFFSETOF(logsql_state, transfer_table_name), RSRC_CONF, 
          "The database table that holds the transfer log")
@@ -1162,17 +1219,14 @@ static const command_rec log_sql_cmds[] = {
          (void *)APR_OFFSETOF(logsql_state, cookie_table_name), RSRC_CONF,
          "The database table that holds the cookie info")
         ,
-        /* Log format */
         AP_INIT_TAKE1("LogSQLTransferLogFormat", set_logformat_slot,
          NULL, RSRC_CONF,
          "Instruct the module what information to log to the database transfer log")
         ,
-        /* Machine ID */
         AP_INIT_TAKE1("LogSQLMachineID", set_global_string_slot,
          (void *)APR_OFFSETOF(global_config_t, machid), RSRC_CONF,
          "Machine ID that the module will log, useful in web clusters to differentiate machines")
         ,
-        /* Limits on logging */
         AP_INIT_ITERATE("LogSQLRequestAccept", add_server_string_slot,
          (void *)APR_OFFSETOF(logsql_state, transfer_accept_list), RSRC_CONF,
          "List of URIs to accept for logging. Accesses that don't match will not be logged")
@@ -1185,11 +1239,48 @@ static const command_rec log_sql_cmds[] = {
          (void *)APR_OFFSETOF(logsql_state, remhost_ignore_list), RSRC_CONF,
          "List of remote hosts to ignore. Accesses that match will not be logged to database")
         ,
-        /* Special loggin table configuration */
+        AP_INIT_TAKE1("LogSQLDatabase", set_global_string_slot, 
+         (void *)APR_OFFSETOF(global_config_t, dbname), RSRC_CONF,
+         "The name of the database database for logging")
+        ,
         AP_INIT_TAKE1("LogSQLWhichCookie", set_server_string_slot, 
          (void *)APR_OFFSETOF(logsql_state, cookie_name), RSRC_CONF,
          "The single cookie that you want logged in the access_log when using the 'c' config directive")
         ,
+        AP_INIT_TAKE3("LogSQLLoginInfo", set_log_sql_info, NULL, RSRC_CONF,
+         "The database host, user-id and password for logging")
+        ,
+        AP_INIT_FLAG("LogSQLCreateTables", set_global_nmv_flag_slot, 
+         (void *)APR_OFFSETOF(global_config_t, createtables), RSRC_CONF,
+         "Turn on module's capability to create its SQL tables on the fly")
+        ,
+        AP_INIT_FLAG("LogSQLMassVirtualHosting", set_global_flag_slot,
+         (void *)APR_OFFSETOF(global_config_t, massvirtual), RSRC_CONF,
+         "Activates option(s) useful for ISPs performing mass virutal hosting")
+        ,
+        AP_INIT_FLAG("LogSQLDelayedInserts", set_global_flag_slot,
+         (void *)APR_OFFSETOF(global_config_t, insertdelayed), RSRC_CONF,
+         "Whether to use delayed inserts")
+        ,
+        AP_INIT_FLAG("LogSQLForcePreserve", set_global_flag_slot,
+         (void *)APR_OFFSETOF(global_config_t, forcepreserve), RSRC_CONF,
+         "Forces logging to preserve file and bypasses database")
+        ,
+        AP_INIT_TAKE1("LogSQLPreserveFile", set_global_string_slot,
+         (void *)APR_OFFSETOF(logsql_state,preserve_file), RSRC_CONF,
+         "Name of the file to use for data preservation during database downtime")
+        ,
+        AP_INIT_TAKE1("LogSQLSocketFile", set_global_string_slot,
+         (void *)APR_OFFSETOF(global_config_t, socketfile), RSRC_CONF,
+         "Name of the file to employ for socket connections to database")
+        ,
+        AP_INIT_TAKE1("LogSQLTableType", set_global_string_slot,
+         (void *)APR_OFFSETOF(global_config_t, tabletype), RSRC_CONF,
+         "What kind of table to create (MyISAM, InnoDB,...) when creating tables")
+        ,
+        AP_INIT_TAKE1("LogSQLTCPPort", set_log_sql_tcp_port, NULL, RSRC_CONF,
+         "Port number to use for TCP connections to database, defaults to 3306 if not set")
+        ,
         AP_INIT_ITERATE("LogSQLWhichNotes", add_server_string_slot,
          (void *)APR_OFFSETOF(logsql_state, notes_list), RSRC_CONF,
          "Notes that you would like to log in a separate table")
@@ -1206,26 +1297,6 @@ static const command_rec log_sql_cmds[] = {
          (void *)APR_OFFSETOF(logsql_state, cookie_list), RSRC_CONF,
          "The cookie(s) that you would like to log in a separate table")
         ,
-        AP_INIT_RAW_ARGS("LogSQLDeprecated", ap_set_deprecated, NULL, RSRC_CONF,
-         "<br><b>Deprecated</b><br>The following Commands are deprecated and should not be used.. <br>Read the documentation for more information<br><b>Deprecated</b>")
-        ,
-        /* Deprecated commands */
-        AP_INIT_TAKE1("LogSQLDatabase", set_dbparam_slot, 
-         (void *)"database", RSRC_CONF,
-         "<b>(Deprecated) Use LogSQLDBParam database dbname.</b> The name of the database database for logging")
-        ,
-        AP_INIT_TAKE1("LogSQLTableType", set_dbparam_slot,
-         (void *)"tabletype", RSRC_CONF,
-         "<b>(Deprecated) Use LogSQLDBParam tabletype type.</b> What kind of table to create (MyISAM, InnoDB,...) when creating tables")
-        ,
-        AP_INIT_TAKE1("LogSQLSocketFile", set_dbparam_slot,
-         (void *)"socketfile", RSRC_CONF,
-         "<b>(Deprecated) Use LogSQLDBParam socketfile socket.</b> Name of the file to employ for socket connections to database")
-        ,
-        AP_INIT_TAKE1("LogSQLTCPPort", set_dbparam_slot, 
-         (void *)"port", RSRC_CONF,
-         "<b>(Deprecated) Use LogSQLDBParam port port.</b> Port number to use for TCP connections to database, defaults to 3306 if not set")
-        ,
         {NULL}
 };
 /* The configuration array that sets up the hooks into the module. */
@@ -1233,6 +1304,7 @@ static const command_rec log_sql_cmds[] = {
 static void register_hooks(apr_pool_t *p) {
         ap_hook_post_config(log_sql_post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
         ap_hook_child_init(log_sql_child_init, NULL, NULL, APR_HOOK_MIDDLE);
+        ap_hook_open_logs(log_sql_open, NULL, NULL, APR_HOOK_MIDDLE);
         ap_hook_log_transaction(log_sql_transaction, NULL, NULL, APR_HOOK_MIDDLE);
 }
 
@@ -1246,7 +1318,7 @@ module AP_MODULE_DECLARE_DATA log_sql_module = {
     register_hooks      /* register hooks */
 };
 #elif defined(WITH_APACHE13)
-module MODULE_VAR_EXPORT log_sql_module = {
+module log_sql_module = {
         STANDARD_MODULE_STUFF,
         log_sql_module_init,     /* module initializer                          */
         NULL,                                    /* create per-dir config                       */