compiles and loads under apache2.0

consolidated configuration functions uses APR_OFFSETOF..
delayed inserts are configurable

6 files changed, 599 insertions, 585 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 1576da7..de34ba1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,20 +1,23 @@
-$Id: CHANGELOG,v 1.1 2003/12/20 07:16:05 urkle Exp $
+$Id: CHANGELOG,v 1.2 2003/12/22 04:45:38 urkle Exp $
 
 TODO:
 * Rethink documentation flow and rewrite?
 * Port connection portion to other DBMS?  Genericize the module?  Start with 
-  PostgreSQL.
-* GNU autoconf
+  PostgreSQL. (provider mechanism, and libDBI)
 * merge server config into vh config
-* port to Apache 2.x
 * does determining table name in massvirtual mode upon every request
   cause performance degradation?  If so fix.
 * LogSQLRotateLogs directive with daily/monthly/weekly/etc.
-* new format char: IP as bigint?
+* new format char: IP as bigint? ( not w/ ipV6 )
 * socket-based middleman daemon with configurable conns, or connect/disconnect.
 * ignore by cookie
 
 CHANGES:
+1.90: ?
+* updated code to compile under apache 2.0
+* rewrote and consolidate configuration handler routines
+* made all functions static.
+* made delayed insert configurable, instead of compile time
 
 1.18:
 * Delayed inserts (a MySQL extension) are now available at compile-time.
@@ -351,5 +354,3 @@ to MySQL
 * Segmentation fault in case of certain parameters lacking fixed.
 * Worked around the SIGPIPE signal that's sent in certain events from
 * mysql_query(). Minor modifications
-
-
diff --git a/Makefile.in b/Makefile.in
index 5902fab..b143029 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,7 +11,7 @@ CFLAGS = -Wc,-Wall -Wc,-Werror -Wc,-fno-strict-aliasing
 
 INCLUDES = -I/usr/include/mysql
 
-LDADD = 
+LDADD = -L/usr/lib/mysql -lmysqlclient
 
 EXTRA_DIST = INSTALL LICENSE CHANGELOG make_combined_log.pl
 
diff --git a/configure.ac b/configure.ac
index 2011793..4fa277a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Required initializer
-AC_INIT(mod_log_sql, 1.99)
+AC_INIT(mod_log_sql, 1.90)
 AC_PREREQ(2.53)
 AC_CONFIG_HEADERS(config.h)
 
diff --git a/create_tables.sql b/create_tables.sql
index dbcfbe4..0266b52 100644
--- a/create_tables.sql
+++ b/create_tables.sql
@@ -15,7 +15,7 @@ create table access_log (
         request_method varchar(10) ,
         request_protocol varchar(10) ,
         request_time char(28),
-        request_uri varchar(50),
+        request_uri varchar(255),
         request_args varchar(255),
         server_port smallint unsigned,
         ssl_cipher varchar(25),
diff --git a/mod_log_sql.c b/mod_log_sql.c
index 60d2b33..8a48b17 100644
--- a/mod_log_sql.c
+++ b/mod_log_sql.c
@@ -1,70 +1,92 @@
-/* $Header: /home/cvs/mod_log_sql/mod_log_sql.c,v 1.2 2003/12/21 17:45:51 urkle Exp $ */
+/* $Header: /home/cvs/mod_log_sql/mod_log_sql.c,v 1.3 2003/12/22 04:45:38 urkle Exp $ */
 /* --------*
  * DEFINES *
  * --------*/
 
 /* The enduser may wish to modify this */
-#undef DEBUG
+#define DEBUG
 
 /* The enduser won't modify these */
 #define MYSQL_ERROR(mysql) ((mysql)?(mysql_error(mysql)):"MySQL server has gone away")
-#define ERRLEVEL APLOG_ERR|APLOG_NOERRNO
-#define WARNINGLEVEL APLOG_WARNING|APLOG_NOERRNO
-#define NOTICELEVEL APLOG_NOTICE|APLOG_NOERRNO
-#define DEBUGLEVEL APLOG_DEBUG|APLOG_NOERRNO
 
 /* ---------*
  * INCLUDES *
  * ---------*/
-#include <time.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+
+#include "apr_strings.h"
+#include "apr_lib.h"
+#include "apr_hash.h"
+#include "apr_optional.h"
+#define APR_WANT_STRFUNC
+#include "apr_want.h"
+#include "apr_tables.h"
+
+#include "ap_config.h"
+
 #include "httpd.h"
 #include "http_config.h"
-#include "http_log.h"
 #include "http_core.h"
+#include "http_log.h"
+#include "http_protocol.h"
+
+#include "util_time.h"
+
+#if APR_HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
 #include "mysql.h"
 #include "mysqld_error.h"
 
-#if MODULE_MAGIC_NUMBER >= 19980324 /* M_M_N is defined in /usr/local/Apache/include/ap_mmn.h, 19990320 as of this writing. */
-        #include "ap_compat.h"
+#ifdef HAVE_CONFIG_H
+/* Undefine these to prevent conflicts between Apache ap_config_auto.h and 
+ * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt.
+ */
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
+#include "config.h"
 #endif
 
 #ifdef WANT_SSL_LOGGING
-        #include "mod_ssl.h"
+#include "mod_ssl.h"
 #endif
 
-
 /* -------------*
  * DECLARATIONS *
  * -------------*/
 
 /* Declare ourselves so the configuration routines can find and know us. */
-module sql_log_module;
+module AP_MODULE_DECLARE_DATA log_sql_module;
 
 /* The contents of these are known 'Apache wide' and are not variable
  * on a per-virtual-server basis.  Every virtual server 'knows' the
  * same versions of these variables.
  */
-MYSQL logsql_server, *logsql_server_p = NULL;
-
-int logsql_massvirtual = 0;
-int logsql_createtables = 0;
-int logsql_forcepreserve = 0;
-char *logsql_dbname = NULL;
-char *logsql_dbhost = NULL;
-char *logsql_dbuser = NULL;
-char *logsql_dbpwd  = NULL;
-char *logsql_machid = NULL;
-char *logsql_socketfile = "/tmp/mysql.sock";
-unsigned int logsql_tcpport = 3306;
-
-#ifdef WANT_DELAYED_MYSQL_INSERT
- char *logsql_insertclause = "insert delayed into ";
-#else
- char *logsql_insertclause = "insert into ";
-#endif
+
+typedef struct {
+        int massvirtual;
+        int createtables;
+        int forcepreserve;
+        char *dbname;
+        char *dbhost;
+        char *dbuser;
+        char *dbpwd;
+        char *machid;
+        char *socketfile;
+        unsigned int tcpport;
+        int insertdelayed;
+        MYSQL server;
+        MYSQL *server_p;
+} global_config_t;
+
+static global_config_t global_config;
 
 typedef const char *(*item_key_func) (request_rec *, char *);
 
@@ -75,13 +97,13 @@ typedef const char *(*item_key_func) (request_rec *, char *);
  * Each child process has its own segregated copy of this structure.
  */
 typedef struct {
-        apr_array_t *transfer_ignore_list;
-        array_header *transfer_accept_list;
-        array_header *remhost_ignore_list;
-        array_header *notes_list;
-        array_header *hout_list;
-        array_header *hin_list;
-        array_header *cookie_list;
+        apr_array_header_t *transfer_ignore_list;
+        apr_array_header_t *transfer_accept_list;
+        apr_array_header_t *remhost_ignore_list;
+        apr_array_header_t *notes_list;
+        apr_array_header_t *hout_list;
+        apr_array_header_t *hin_list;
+        apr_array_header_t *cookie_list;
         char *notes_table_name;
         char *hout_table_name;
         char *hin_table_name;
@@ -97,16 +119,16 @@ typedef struct {
  * HELPER FUNCTIONS *
  * -----------------*/
 
-int safe_create_tables(logsql_state *cls, request_rec *r);
+static int safe_create_tables(logsql_state *cls, request_rec *r);
 
-static char *format_integer(pool *p, int i)
+static char *format_integer(apr_pool_t *p, int i)
 {
         char dummy[40];
-        ap_snprintf(dummy, sizeof(dummy), "%d", i);
-        return pstrdup(p, dummy);
+        apr_snprintf(dummy, sizeof(dummy), "%d", i);
+        return apr_pstrdup(p, dummy);
 }
 
-static char *pfmt(pool *p, int i)
+static char *pfmt(apr_pool_t *p, int i)
 {
         if (i <= 0) {
                 return "-";
@@ -122,17 +144,17 @@ static char *pfmt(pool *p, int i)
 
 static const char *extract_remote_host(request_rec *r, char *a)
 {
-        return (char *) get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME);
+        return (char *) ap_get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME, NULL);
 }
 
 static const char *extract_remote_logname(request_rec *r, char *a)
 {
-        return (char *) get_remote_logname(r);
+        return (char *) ap_get_remote_logname(r);
 }
 
 static const char *extract_remote_user(request_rec *r, char *a)
 {
-        char *rvalue = r->connection->user;
+        char *rvalue = r->user;
 
         if (rvalue == NULL) {
                 rvalue = "-";
@@ -150,7 +172,7 @@ static const char *extract_ssl_keysize(request_rec *r, char *a)
         if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE");
                 #ifdef DEBUG
-            ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"SSL_KEYSIZE: %s", result);
+            ap_log_error(APLOG_MARK,APLOG_DEBUG,r->server,"SSL_KEYSIZE: %s", result);
                 #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
@@ -167,7 +189,7 @@ static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
         if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE");
                 #ifdef DEBUG
-            ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"SSL_ALGKEYSIZE: %s", result);
+            ap_log_error(APLOG_MARK,APLOG_DEBUG,r->server,"SSL_ALGKEYSIZE: %s", result);
                 #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
@@ -184,7 +206,7 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
         if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER");
                 #ifdef DEBUG
-            ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"SSL_CIPHER: %s", result);
+            ap_log_error(APLOG_MARK,APLOG_DEBUG,r->server,"SSL_CIPHER: %s", result);
                 #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
@@ -232,14 +254,10 @@ static const char *extract_status(request_rec *r, char *a)
 
 static const char *extract_bytes_sent(request_rec *r, char *a)
 {
-        if (!r->sent_bodyct) {
+        if (!r->sent_bodyct || !r->bytes_sent) {
                 return "-";
         } else {
-                long int bs;
-                char dummy[40];
-                bgetopt(r->connection->client, BO_BYTECT, &bs);
-                ap_snprintf(dummy, sizeof(dummy), "%ld", bs);
-                return pstrdup(r->pool, dummy);
+                return apr_psprintf(r->pool, "%" APR_OFF_T_FMT, r->bytes_sent);
         }
 }
 
@@ -261,71 +279,141 @@ static const char *extract_header_out(request_rec *r, char *a)
         return table_get(r->err_headers_out, a);
 }
 */
+static const char *extract_request_time_custom(request_rec *r, char *a,
+                                           apr_time_exp_t *xt)
+{
+    apr_size_t retcode;
+    char tstr[MAX_STRING_LEN];
+    apr_strftime(tstr, &retcode, sizeof(tstr), a, xt);
+    return apr_pstrdup(r->pool, tstr);
+}
+
+#define DEFAULT_REQUEST_TIME_SIZE 32
+typedef struct {
+    unsigned t;
+    char timestr[DEFAULT_REQUEST_TIME_SIZE];
+    unsigned t_validate;
+} cached_request_time;
+
+#define TIME_CACHE_SIZE 4
+#define TIME_CACHE_MASK 3
+static cached_request_time request_time_cache[TIME_CACHE_SIZE];
 
 static const char *extract_request_time(request_rec *r, char *a)
 {
-        int timz;
-        struct tm *t;
-        char tstr[MAX_STRING_LEN];
-
-        t = get_gmtoff(&timz);
+        apr_time_exp_t xt;
 
+        /* Please read comments in mod_log_config.h for more info about
+         * the I_INSIST....COMPLIANCE define
+         */
         if (a && *a) {     /* Custom format */
-                strftime(tstr, MAX_STRING_LEN, a, t);
+#ifdef I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
+        ap_explode_recent_localtime(&xt, apr_time_now());
+#else
+        ap_explode_recent_localtime(&xt, r->request_time);
+#endif
+        return extract_request_time_custom(r, a, &xt);
         } else {                   /* CLF format */
-                char sign = (timz < 0 ? '-' : '+');
-
-                if (timz < 0) {
-                        timz = -timz;
+        /* This code uses the same technique as ap_explode_recent_localtime():
+         * optimistic caching with logic to detect and correct race conditions.
+         * See the comments in server/util_time.c for more information.
+         */
+        cached_request_time* cached_time = apr_palloc(r->pool,
+                                                      sizeof(*cached_time));
+#ifdef I_INSIST_ON_EXTRA_CYCLES_FOR_CLF_COMPLIANCE
+        apr_time_t request_time = apr_time_now();
+#else
+        apr_time_t request_time = r->request_time;
+#endif
+        unsigned t_seconds = (unsigned)apr_time_sec(request_time);
+        unsigned i = t_seconds & TIME_CACHE_MASK;
+        memcpy(cached_time, &(request_time_cache[i]), sizeof(*cached_time));
+        if ((t_seconds != cached_time->t) ||
+            (t_seconds != cached_time->t_validate)) {
+
+            /* Invalid or old snapshot, so compute the proper time string
+             * and store it in the cache
+             */
+            char sign;
+            int timz;
+
+            ap_explode_recent_localtime(&xt, r->request_time);
+            timz = xt.tm_gmtoff;
+            if (timz < 0) {
+                timz = -timz;
+                sign = '-';
+            }
+            else {
+                sign = '+';
+            }
+            cached_time->t = t_seconds;
+            apr_snprintf(cached_time->timestr, DEFAULT_REQUEST_TIME_SIZE,
+                         "[%02d/%s/%d:%02d:%02d:%02d %c%.2d%.2d]",
+                         xt.tm_mday, apr_month_snames[xt.tm_mon],
+                         xt.tm_year+1900, xt.tm_hour, xt.tm_min, xt.tm_sec,
+                         sign, timz / (60*60), timz % (60*60));
+            cached_time->t_validate = t_seconds;
+            memcpy(&(request_time_cache[i]), cached_time,
+                   sizeof(*cached_time));
                 }
-                strftime(tstr, MAX_STRING_LEN, "[%d/%b/%Y:%H:%M:%S ", t);
-                ap_snprintf(tstr + strlen(tstr), sizeof(tstr) - strlen(tstr), "%c%.2d%.2d]", sign, timz / 60, timz % 60);
+                return cached_time->timestr;
         }
-
-        return pstrdup(r->pool, tstr);
 }
 
 static const char *extract_request_duration(request_rec *r, char *a)
 {
-        char duration[22];                       /* Long enough for 2^64 */
+        apr_time_t duration = apr_time_now() - r->request_time;
+        return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, apr_time_sec(duration));
+}
 
-        ap_snprintf(duration, sizeof(duration), "%ld", time(NULL) - r->request_time);
-        return pstrdup(r->pool, duration);
+static const char *extract_request_duration_microseconds(request_rec *r, char *a) __attribute__ ((unused));
+static const char *extract_request_duration_microseconds(request_rec *r, char *a)
+{
+    return apr_psprintf(r->pool, "%" APR_TIME_T_FMT, 
+                        (apr_time_now() - r->request_time));
 }
 
 static const char *extract_virtual_host(request_rec *r, char *a)
 {
-    return ap_get_server_name(r);
+    return apr_pstrdup(r->pool, r->server->server_hostname);
 }
 
 static const char *extract_machine_id(request_rec *r, char *a)
 {
-        if (!logsql_machid)
+        if (!global_config.machid)
                 return "-";
         else
-                return logsql_machid;
+                return global_config.machid;
 }
 
 static const char *extract_server_port(request_rec *r, char *a)
 {
-        char portnum[22];
-
-        ap_snprintf(portnum, sizeof(portnum), "%u", r->server->port);
-        return pstrdup(r->pool, portnum);
+    return apr_psprintf(r->pool, "%u",
+                        r->server->port ? r->server->port : ap_default_port(r));
 }
 
 static const char *extract_child_pid(request_rec *r, char *a)
 {
-        char pidnum[22];
-        ap_snprintf(pidnum, sizeof(pidnum), "%ld", (long) getpid());
-        return pstrdup(r->pool, pidnum);
+    if (*a == '\0' || !strcmp(a, "pid")) {
+        return apr_psprintf(r->pool, "%" APR_PID_T_FMT, getpid());
+    }
+    else if (!strcmp(a, "tid")) {
+#if APR_HAS_THREADS
+        apr_os_thread_t tid = apr_os_thread_current();
+#else
+        int tid = 0; /* APR will format "0" anyway but an arg is needed */
+#endif
+        return apr_psprintf(r->pool, "%pT", &tid);
+    }
+    /* bogus format */
+    return a;
 }
 
 static const char *extract_referer(request_rec *r, char *a)
 {
         const char *tempref;
 
-        tempref = table_get(r->headers_in, "Referer");
+        tempref = apr_table_get(r->headers_in, "Referer");
         if (!tempref)
         {
                 return "-";
@@ -338,7 +426,7 @@ static const char *extract_agent(request_rec *r, char *a)
 {
     const char *tempag;
 
-    tempag = table_get(r->headers_in, "User-Agent");
+    tempag = apr_table_get(r->headers_in, "User-Agent");
     if (!tempag)
     {
         return "-";
@@ -354,18 +442,21 @@ static const char *extract_cookie(request_rec *r, char *a)
         char *isvalid;
         char *cookiebuf;
 
-        logsql_state *cls = get_module_config(r->server->module_config, &sql_log_module);
+        logsql_state *cls = ap_get_module_config(r->server->module_config,
+                                                                                        &log_sql_module);
 
         if (cls->cookie_name != NULL) {
                 #ifdef DEBUG
-                        ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"watching for cookie '%s'", cls->cookie_name);
+                        ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0, r,
+                                "watching for cookie '%s'", cls->cookie_name);
                 #endif
 
                 /* Fetch out the cookie header */
-                cookiestr  = (char *)table_get(r->headers_in,  "cookie2");
+                cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie2");
             if (cookiestr != NULL) {
                         #ifdef DEBUG
-                                ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"Cookie2: [%s]", cookiestr);
+                                ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0, r,
+                                        "Cookie2: [%s]", cookiestr);
                         #endif
                         /* Does the cookie string contain one with our name? */
                         isvalid = strstr(cookiestr, cls->cookie_name);
@@ -373,7 +464,7 @@ static const char *extract_cookie(request_rec *r, char *a)
                                 /* Move past the cookie name and equal sign */
                                 isvalid += strlen(cls->cookie_name) + 1;
                                 /* Duplicate it into the pool */
-                            cookiebuf = ap_pstrdup(r->pool, isvalid);
+                            cookiebuf = apr_pstrdup(r->pool, isvalid);
                                 /* Segregate just this cookie out of the string
                                  * with a terminating nul at the first semicolon */
                             cookieend = strchr(cookiebuf, ';');
@@ -383,15 +474,16 @@ static const char *extract_cookie(request_rec *r, char *a)
                         }
                 }
 
-                cookiestr  = (char *)table_get(r->headers_in,  "cookie");
+                cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie");
             if (cookiestr != NULL) {
                         #ifdef DEBUG
-                                ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"Cookie: [%s]", cookiestr);
+                                ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,r,
+                                        "Cookie: [%s]", cookiestr);
                         #endif
                         isvalid = strstr(cookiestr, cls->cookie_name);
                         if (isvalid != NULL) {
                                 isvalid += strlen(cls->cookie_name) + 1;
-                            cookiebuf = ap_pstrdup(r->pool, isvalid);
+                            cookiebuf = apr_pstrdup(r->pool, isvalid);
                             cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
@@ -399,15 +491,16 @@ static const char *extract_cookie(request_rec *r, char *a)
                         }
                 }
 
-                cookiestr = table_get(r->headers_out,  "set-cookie");
+                cookiestr = apr_table_get(r->headers_out,  "set-cookie");
             if (cookiestr != NULL) {
                         #ifdef DEBUG
-                             ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"Set-Cookie: [%s]", cookiestr);
+                             ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,r,
+                                        "Set-Cookie: [%s]", cookiestr);
                         #endif
                         isvalid = strstr(cookiestr, cls->cookie_name);
                         if (isvalid != NULL) {
                             isvalid += strlen(cls->cookie_name) + 1;
-                            cookiebuf = ap_pstrdup(r->pool, isvalid);
+                            cookiebuf = apr_pstrdup(r->pool, isvalid);
                             cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
@@ -428,14 +521,16 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
         if (a != NULL) {
                 #ifdef DEBUG
-                        ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"watching for cookie '%s'", a);
+                        ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,
+                                r,"watching for cookie '%s'", a);
                 #endif
 
                 /* Fetch out the cookie header */
-                cookiestr  = (char *)table_get(r->headers_in,  "cookie2");
+                cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie2");
             if (cookiestr != NULL) {
                         #ifdef DEBUG
-                                ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"Cookie2: [%s]", cookiestr);
+                                ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,r,
+                                        "Cookie2: [%s]", cookiestr);
                         #endif
                         /* Does the cookie string contain one with our name? */
                         isvalid = strstr(cookiestr, a);
@@ -443,7 +538,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
                                 /* Move past the cookie name and equal sign */
                                 isvalid += strlen(a) + 1;
                                 /* Duplicate it into the pool */
-                            cookiebuf = ap_pstrdup(r->pool, isvalid);
+                            cookiebuf = apr_pstrdup(r->pool, isvalid);
                                 /* Segregate just this cookie out of the string
                                  * with a terminating nul at the first semicolon */
                             cookieend = strchr(cookiebuf, ';');
@@ -453,15 +548,16 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
                         }
                 }
 
-                cookiestr  = (char *)table_get(r->headers_in,  "cookie");
+                cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie");
             if (cookiestr != NULL) {
                         #ifdef DEBUG
-                                ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"Cookie: [%s]", cookiestr);
+                                ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,r,
+                                        "Cookie: [%s]", cookiestr);
                         #endif
                         isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                                 isvalid += strlen(a) + 1;
-                            cookiebuf = ap_pstrdup(r->pool, isvalid);
+                            cookiebuf = apr_pstrdup(r->pool, isvalid);
                             cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
@@ -469,15 +565,16 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
                         }
                 }
 
-                cookiestr = table_get(r->headers_out,  "set-cookie");
+                cookiestr = apr_table_get(r->headers_out,  "set-cookie");
             if (cookiestr != NULL) {
                         #ifdef DEBUG
-                             ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"Set-Cookie: [%s]", cookiestr);
+                             ap_log_rerror(APLOG_MARK,APLOG_DEBUG,0,r,
+                                        "Set-Cookie: [%s]", cookiestr);
                         #endif
                         isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                             isvalid += strlen(a) + 1;
-                            cookiebuf = ap_pstrdup(r->pool, isvalid);
+                            cookiebuf = apr_pstrdup(r->pool, isvalid);
                             cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
@@ -492,30 +589,27 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
 static const char *extract_request_timestamp(request_rec *r, char *a)
 {
-        char tstr[32];
-
-        ap_snprintf(tstr, 32, "%ld", time(NULL));
-        return pstrdup(r->pool, tstr);
+        return apr_psprintf(r->pool, "%ld", time(NULL));
 }
 
 /*
 static const char *extract_note(request_rec *r, char *a)
 {
-        return ap_table_get(r->notes, a);
+        return apr_table_get(r->notes, a);
 
 }
 */
 
 static const char *extract_env_var(request_rec *r, char *a)
 {
-        return ap_table_get(r->subprocess_env, a);
+        return apr_table_get(r->subprocess_env, a);
 }
 
 static const char *extract_unique_id(request_rec *r, char *a)
 {
     const char *tempid;
 
-        tempid = ap_table_get(r->subprocess_env, "UNIQUE_ID");
+        tempid = apr_table_get(r->subprocess_env, "UNIQUE_ID");
         if (!tempid)
           return "-";
         else
@@ -532,7 +626,7 @@ struct log_sql_item_list {
           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 */
-    } log_sql_item_keys[] = {
+    } static log_sql_item_keys[] = {
 
         {   'A', extract_agent,             "agent",            1, 1    },
         {   'a', extract_request_args,      "request_args",     1, 1    },
@@ -569,7 +663,7 @@ struct log_sql_item_list {
 /* Routine to escape the 'dangerous' characters that would otherwise
  * corrupt the INSERT string: ', \, and "
  */
-const char *escape_query(const char *from_str, pool *p)
+static const char *escape_query(const char *from_str, apr_pool_t *p)
 {
         if (!from_str)
                 return NULL;
@@ -581,12 +675,12 @@ const char *escape_query(const char *from_str, pool *p)
                 /* 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 *) ap_palloc(p, length * 2 + 1);
+                to_str = (char *) apr_palloc(p, length * 2 + 1);
                 if (!to_str) {
                         return from_str;
                 }
 
-                if (!logsql_server_p) {
+                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.
@@ -596,7 +690,7 @@ const char *escape_query(const char *from_str, pool *p)
                         /* MySQL is available, so I'll go ahead and respect the current charset when
                          * I perform the escape.
                          */
-                        retval = mysql_real_escape_string(logsql_server_p, to_str, from_str, length);
+                        retval = mysql_real_escape_string(global_config.server_p, to_str, from_str, length);
                 }
 
                 if (retval)
@@ -606,7 +700,7 @@ const char *escape_query(const char *from_str, pool *p)
         }
 }
 
-int open_logdb_link(server_rec* s)
+static int open_logdb_link(server_rec* s)
 {
         /* Returns:
            3 if preserve forced
@@ -615,91 +709,89 @@ int open_logdb_link(server_rec* s)
            0 if unsuccessful
         */
 
-        if (logsql_forcepreserve)
+        if (global_config.forcepreserve)
                 return 3;
 
-        if (logsql_server_p)
+        if (global_config.server_p)
                 return 2;
 
-        if ((logsql_dbname) && (logsql_dbhost) && (logsql_dbuser) && (logsql_dbpwd)) {
-                mysql_init(&logsql_server);
-                logsql_server_p = mysql_real_connect(&logsql_server, logsql_dbhost, logsql_dbuser, logsql_dbpwd, logsql_dbname, logsql_tcpport, logsql_socketfile, 0);
+        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 (logsql_server_p) {
+                if (global_config.server_p) {
                         #ifdef DEBUG
-                          ap_log_error(APLOG_MARK,DEBUGLEVEL,s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
-                                                                                                        logsql_dbhost, logsql_tcpport, logsql_dbname, logsql_dbuser, logsql_socketfile);
+                          ap_log_error(APLOG_MARK,APLOG_DEBUG,0,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 {
                         #ifdef DEBUG
-                          ap_log_error(APLOG_MARK,DEBUGLEVEL,s,"mod_log_sql: database connection error: %s",MYSQL_ERROR(&logsql_server));
-                          ap_log_error(APLOG_MARK,DEBUGLEVEL,s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
-                                                                                                        logsql_dbhost, logsql_tcpport, logsql_dbname, logsql_dbuser, logsql_socketfile);
+                          ap_log_error(APLOG_MARK,APLOG_DEBUG,0,s,"mod_log_sql: database connection error: %s",MYSQL_ERROR(&global_config.server));
+                          ap_log_error(APLOG_MARK,APLOG_DEBUG,0,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;
                 }
         } else {
-                ap_log_error(APLOG_MARK,ERRLEVEL,s,"mod_log_sql: insufficient configuration info to establish database link");
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,s,"mod_log_sql: insufficient configuration info to establish database link");
                 return 0;
         }
 }
 
-const char *extract_table(void *data, const char *key, const char *val)
+/*static const char *extract_table(void *data, const char *key, const char *val)
 {
     request_rec *r = (request_rec *)data;
 
-        return ap_pstrcat(r->pool, key, " = ", val, " ", NULL);
-}
+        return apr_pstrcat(r->pool, key, " = ", val, " ", NULL);
+}*/
 
-void preserve_entry(request_rec *r, const char *query)
+static void preserve_entry(request_rec *r, const char *query)
 {
-        FILE *fp;
-        logsql_state *cls = get_module_config(r->server->module_config, &sql_log_module);
+        apr_file_t *fp;
+        logsql_state *cls = ap_get_module_config(r->server->module_config, 
+                                                                                        &log_sql_module);
 
-        fp = pfopen(r->pool, cls->preserve_file, "a");
-        if (fp == NULL)
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: attempted append of local preserve file but failed.");
-        else {
-                fprintf(fp,"%s;\n", query);
-                pfclose(r->pool, fp);
+        if (apr_file_open(&fp, cls->preserve_file,APR_APPEND, APR_OS_DEFAULT, r->pool)!=APR_SUCCESS) {
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: attempted append of local preserve file but failed.");
+        } else {
+                apr_file_printf(fp,"%s;\n", query);
+                apr_file_close(fp);
                 #ifdef DEBUG
-                  ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"mod_log_sql: entry preserved in %s", cls->preserve_file);
+                  ap_log_error(APLOG_MARK,APLOG_DEBUG,0,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      */
-/*-----------------------------------------------------*/
-unsigned int safe_sql_query(request_rec *r, const char *query)
+/*-----------------------------------------------------*
+ * 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;
-        #ifdef WANT_DELAYED_MYSQL_INSERT
-         char *real_error_str;
-        #endif
+        unsigned int real_error = 0;
+        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 (!logsql_server_p) {
+        if (!global_config.server_p) {
                 signal(SIGPIPE, handler);
                 return 1;
-        } else if (!(retval = mysql_query(logsql_server_p, query))) {
+        } else if (!(retval = mysql_query(global_config.server_p, query))) {
                 signal(SIGPIPE, handler);
                 return 0;
         }
@@ -707,37 +799,38 @@ unsigned int safe_sql_query(request_rec *r, const char *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.) */
-        #ifdef WANT_DELAYED_MYSQL_INSERT
-         real_error_str = MYSQL_ERROR(logsql_server_p);
-        #else
-         real_error = mysql_errno(logsql_server_p);
-        #endif
+        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" */
-        #ifdef WANT_DELAYED_MYSQL_INSERT
-         if ((strstr(real_error_str, "Table")) && (strstr(real_error_str,"doesn't exist"))) {
-        #else
-         if (real_error == ER_NO_SUCH_TABLE) {
-        #endif
-                if (logsql_createtables) {
-                        ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: table doesn't exist...creating now");
-                        cls = get_module_config(r->server->module_config, &sql_log_module);
+        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) {
+                        ap_log_error(APLOG_MARK,APLOG_ERR,0,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)) {
-                                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: child attempted but failed to create one or more tables for %s, preserving query", ap_get_server_name(r));
+                                ap_log_error(APLOG_MARK,APLOG_ERR,0,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(logsql_server_p);
+                                retval = mysql_errno(global_config.server_p);
                         } else {
-                                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: tables successfully created - retrying query");
-                                if (mysql_query(logsql_server_p, query)) {
-                                        ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: giving up, preserving query");
+                                ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: tables successfully created - retrying query");
+                                if (mysql_query(global_config.server_p, query)) {
+                                        ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: giving up, preserving query");
                                         preserve_entry(r, query);
-                                        retval = mysql_errno(logsql_server_p);
+                                        retval = mysql_errno(global_config.server_p);
                                 } else
-                                        ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: query successful after table creation");
+                                        ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: query successful after table creation");
                                         retval = 0;
                         }
                 } else {
-                        ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql, table doesn't exist, creation denied by configuration, preserving query");
+                        ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql, table doesn't exist, creation denied by configuration, preserving query");
                         preserve_entry(r, query);
                         retval = ER_NO_SUCH_TABLE;
                 }
@@ -748,64 +841,66 @@ unsigned int safe_sql_query(request_rec *r, const char *query)
 
         /* Handle all other types of errors */
 
-        cls = get_module_config(r->server->module_config, &sql_log_module);
+        cls = ap_get_module_config(r->server->module_config, &log_sql_module);
 
         /* Something went wrong, so start by trying to restart the db link. */
-        #ifdef WANT_DELAYED_MYSQL_INSERT
+        if (global_config.insertdelayed) {
          real_error = 2;
-        #else
-         real_error = mysql_errno(logsql_server_p);
-        #endif
-        ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: first attempt failed, API said: error %d, \"%s\"", real_error, MYSQL_ERROR(logsql_server_p));
-        mysql_close(logsql_server_p);
-        logsql_server_p = NULL;
+        } else {
+         real_error = mysql_errno(global_config.server_p);
+        }
+
+        ap_log_error(APLOG_MARK,APLOG_ERR,0,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 (logsql_server_p == NULL) {   /* still unable to link */
+        if (global_config.server_p == NULL) {    /* still unable to link */
                 signal(SIGPIPE, handler);
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: reconnect failed, unable to reach database. SQL logging stopped until child regains a db connection.");
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: log entries are being preserved in %s", cls->preserve_file);
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: reconnect failed, unable to reach database. SQL logging stopped until child regains a db connection.");
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: log entries are being preserved in %s", cls->preserve_file);
                 return 1;
         } else
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: db reconnect successful");
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,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)
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: nanosleep unsuccessful");
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,r->server,"mod_log_sql: nanosleep unsuccessful");
 
         /* Then make our second attempt */
-        retval = mysql_query(logsql_server_p,query);
+        retval = mysql_query(global_config.server_p,query);
 
         /* If this one also failed, log that and append to our local offline file */
         if (retval)     {
-                #ifdef WANT_DELAYED_MYSQL_INSERT
+                if (global_config.insertdelayed) {
                  real_error = 2;
-                #else
-                 real_error = mysql_errno(logsql_server_p);
-                #endif
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: second attempt failed, API said: error %d, \"%s\" -- preserving", real_error, MYSQL_ERROR(logsql_server_p));
+                } else {
+                 real_error = mysql_errno(global_config.server_p);
+                }
+
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,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
-                ap_log_error(APLOG_MARK,ERRLEVEL,r->server,"mod_log_sql: second attempt successful");
+                ap_log_error(APLOG_MARK,APLOG_ERR,0,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                            */
-/*-----------------------------------------------------*/
-int safe_create_tables(logsql_state *cls, request_rec *r)
+/*-----------------------------------------------------*
+ * 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;
@@ -859,45 +954,45 @@ int safe_create_tables(logsql_state *cls, request_rec *r)
        val varchar(80))";
 
         /* Find memory long enough to hold the whole CREATE string + \0 */
-        create_access = ap_pstrcat(r->pool, createprefix, cls->transfer_table_name, access_suffix, NULL);
-        create_notes  = ap_pstrcat(r->pool, createprefix, cls->notes_table_name, notes_suffix, NULL);
-        create_hout   = ap_pstrcat(r->pool, createprefix, cls->hout_table_name, headers_suffix, NULL);
-        create_hin    = ap_pstrcat(r->pool, createprefix, cls->hin_table_name, headers_suffix, NULL);
-        create_cookies= ap_pstrcat(r->pool, createprefix, cls->cookie_table_name, cookies_suffix, NULL);
+        create_access = apr_pstrcat(r->pool, createprefix, cls->transfer_table_name, access_suffix, NULL);
+        create_notes  = apr_pstrcat(r->pool, createprefix, cls->notes_table_name, notes_suffix, NULL);
+        create_hout   = apr_pstrcat(r->pool, createprefix, cls->hout_table_name, headers_suffix, NULL);
+        create_hin    = apr_pstrcat(r->pool, createprefix, cls->hin_table_name, headers_suffix, NULL);
+        create_cookies= apr_pstrcat(r->pool, createprefix, cls->cookie_table_name, cookies_suffix, NULL);
 
         #ifdef DEBUG
-                ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"mod_log_sql: create string: %s", create_access);
-                ap_log_error(APLOG_MARK,DEBUGLEVEL,r->server,"mod_log_sql: create string: %s", create_notes);
+                ap_log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"mod_log_sql: create string: %s", create_access);
+                ap_log_error