38 files changed, 1563 insertions, 2451 deletions

diff --git a/.cvsignore b/.cvsignore
index 2f18090..1149bb9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,12 +4,10 @@ aclocal.m4
 .deps
 *.lo
 *.slo
-*.so
 autom4te-2.53.cache
 Makefile
 configure
 config.cache
-config.nice
 config.log
 config.status
 configure
@@ -29,7 +27,3 @@ stamp-h.in
 config.h
 config.h.in
 include
-include13
-include20
-TODO
-Release
diff --git a/AUTHORS b/AUTHORS
index d10c5de..2e62393 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,11 +1,11 @@
-Edward Rudd <eddie at omegaware dot com>
-        Apache 2.0 port. Current Maintainer as of February, 2004
-
-Christopher B. Powell <chris at grubbybaby dot com>
-        Maintainer since version 1.06
+The Apache Foundation
+        standard apache logging module for which this module is based on
 
 Zeev Suraski <bourbon at netvision.net dot il>
         Adding the mysql routines (intial revisions)
 
-The Apache Foundation
-        standard apache logging module for which this module is based on
+Christopher B. Powell <chris at grubbybaby dot com>
+        Maintainer since version 1.06
+
+Edward Rudd <eddie at omegaware dot com>
+        Apache 2.0 port.
diff --git a/CHANGELOG b/CHANGELOG
index 3e0d531..79c740f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,49 +1,35 @@
-1.98: 2004-04-?
-* re-fixed apache.m4 to better detect APR and APU code
-* fixed for win32 compilation under apache 2
-* lowered minumum required apache 2 version to 2.0.40 (RH9)
-* Added LogSQLDisablePreserve to disable the preserve file.
-* Changed default preserve file location to logs/mod_log_sql-preserve
-  And made LogSQLPreserveFile root relative.
-* fixed bug where preserve file wouldn't be created in apache 2
-* finished TransferLog documentation
-* changed strstr to ap_strstr calls and strchr to ap_strchr calls to
-  stop warning when compiling with AP_DEBUG enabled in apache 2
-* Updated apache m4 to not pass for apache 1.3 if apache 2 is found
-
-1.97: 2004-04-08
-* fixed apache.m4 to work with apache 2 setups with different include
-  directories for APR and APU then core Apache
-* cleaned up configuration documentation (updated due to deprecated commands)
-* LogSQLLoginInfo updated to support a connection URI
-* new module "registration" macros to clean up new driver modules
-* mysql driver completely separted from core module
-
-1.96: 2004-03-04
-* fixed LogSQLPreserveFile config parameter
-* reworked safe_create_tables and core SQL insert routine.
-* renamed log_sql_* variables and typedefs to logsql_*
-* separated all mysql specific code to separate code module (DB abstraction)
-* separated TODO from Changelog
-* fixed default value of socket file. it's really /var/lib/mysql/mysql.sock not
-  /tmp/mysql.sock
-* Documentation completely converted to Docbook
-* Documentation updated. (still needs more work done)
-* LogSQLDelayedInserts config option removed
-* Added DB generic LogSQLDBParam. Usage is LogSQLDBParam param value
-  example: LogSQLDBParam tcpport 12345
-* notes, cookes, headersin, headersout tables are no longer created unless they
-  are used.
-
+$Id: CHANGELOG,v 1.11 2004/02/05 22:05:42 urkle Exp $
+
+TODO:
+* Port connection portion to other DBMS?  Genericize the module?  Start with 
+  PostgreSQL. (provider mechanism, and libDBI)
+* 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? ( not w/ ipV6 )
+* socket-based middleman daemon with configurable conns, or connect/disconnect.
+        DBI connection pool when I switch to DBI.
+* ignore by cookie
+* tools to import logs into SQL (waiting on permission from author)
+* Directive to yes/no create ancillary tables (or just access table)
+* break module into separate code files
+    separate DB implimentation into sub-modules via provider mechanism
+* convert documentation to docbook
+* add document building to Makefile.in
+* investigate thread safety issues (libmysqlclient_r)
+        Add thread locks if using standard mysqlclient
+* rewrite main core logging function to optimize for speed.
+
+CHANGES:
 1.95: 2004-02-05
 * audit and update of extract_* functions to acheive same output as 
-  mod_log_config.
+        mod_log_config.
 
 1.94: 2004-02-03
 * ssl loggin back in as separate module under 1.3 and 2.0
 * preparsing of format tags is now done to speed up main logging loop.
 * fixed a nasty bug with pointer arithmetic (ick) that caused a segfault with
-  LogSQLWhichCookies
+        LogSQLWhichCookies
 
 1.93: 2004-01-20
 * Compiles for apache 1.3 AND 2.0
@@ -51,9 +37,9 @@
 * split apache version specific includes to seperate header files
 * added wrapper defines for apache 1.3
 * updated configure m4 scripts to detect both apache versions at the same time 
-  and assign defines as to which version was found.
+        and assign defines as to which version was found.
 * made install default to not activate module in configuration files.
-  use make activate instead
+        (use make activate)
 * split SSL logging to separate module (still needs to be finished)
 
 1.92: 2004-01-05
diff --git a/Documentation/.cvsignore b/Documentation/.cvsignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/Documentation/.cvsignore
@@ -0,0 +1 @@
+Makefile
diff --git a/docs/Makefile.in b/Documentation/Makefile.in
index 81f2298..2d07cfd 100644
--- a/docs/Makefile.in
+++ b/Documentation/Makefile.in
@@ -3,9 +3,7 @@
 # Modify these top variables.
 SUBDIRS = 
 
-EXTRA_DIST = README \
-                manual.xml \
-                manual.html
+EXTRA_DIST = README documentation.lyx
 
 #Don't modify anything below here
 
@@ -18,12 +16,6 @@ DISTFILES = $(STD_DIST) $(EXTRA_DIST)
 
 all: all-subdirs
 
-%.html: %.xml
-                @xmlto html-nochunks $<
-
-%.pdf: %.xml
-                @xmlto pdf $<
-
 all-subdirs install-subdirs update-subdirs clean-subdirs distclean-subdirs:
         @otarget=`echo $@|sed s/-subdirs//`; \
         list=' $(SUBDIRS)'; \
diff --git a/Documentation/README b/Documentation/README
new file mode 100644
index 0000000..15e9612
--- /dev/null
+++ b/Documentation/README
@@ -0,0 +1,13 @@
+$Id: README,v 1.1 2003/12/20 07:16:05 urkle Exp $
+
+The "original" document is the LyX file "documentation.lyx" -- all other
+files here are derived from it.  The most visually accurate document
+and the one I'd recommend reading is the PostScript (.ps) file, although
+a whole host of formats are made available here to suit your preference.
+
+To read the HTML docs, open HTML/documentation.html in your browser.
+To read the .dvi file, use Xdvi or kdvi.
+To read the .ps file, use gv or kghostview.
+To read the .lyx file, use LyX.
+To read the .txt file, use less.
+
diff --git a/docs/documentation.lyx b/Documentation/documentation.lyx
index eeb6af5..eeb6af5 100644
--- a/docs/documentation.lyx
+++ b/Documentation/documentation.lyx
diff --git a/docs/manual.xml b/Documentation/manual.xml
index 880bf03..f2d36ff 100644
--- a/docs/manual.xml
+++ b/Documentation/manual.xml
@@ -1,29 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet href="file://localhost/home/urkle/Documents/DocBook/docbook.css" type="text/css"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
-<!ENTITY EmailContact "<email>urkle &lt;at&gt; outoforder &lt;dot&gt; cc</email>">
-]>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "file:/usr/share/sgml/docbook/xml-dtd-4.1.2-1.0-8/docbookx.dtd">
 <article>
   <articleinfo>
     <title>mod_log_sql Manual</title>
     <author>
-      <firstname>Edward</firstname>
-      <surname>Rudd</surname>
-      <contrib>Conversion from Lyx to DocBook</contrib>
-      <contrib>Current Maintainer</contrib>
-      <affiliation>
-        <address format="linespecific">&EmailContact;</address>
-      </affiliation>
-    </author>
-    <author>
       <firstname>Christopher</firstname>
       <othername>B.</othername>
       <surname>Powell</surname>
-      <contrib>Original documentation author.</contrib>
       <affiliation>
         <address format="linespecific"><email>chris &lt;at&gt; grubbybaby &lt;dot&gt; com</email></address>
       </affiliation>
     </author>
+    <author>
+      <firstname>Edward</firstname>
+      <surname>Rudd</surname>
+      <contrib>Porting from Lyx to DocBook</contrib>
+      <affiliation>
+        <address format="linespecific"><email>eddie &lt;at&gt; omegaware &lt;dot&gt; com</email></address>
+      </affiliation>
+    </author>
     <copyright>
       <year>2001</year>
       <year>2002</year>
@@ -36,39 +32,29 @@
     </copyright>
     <revhistory>
       <revision>
-        <revnumber>1.2</revnumber>
-        <date>2004-04-?</date>
-        <revremark>Updated for mod_log_sql v1.97</revremark>
-      </revision>
-      <revision>
-        <revnumber>1.1</revnumber>
-        <date>2004-03-02</date>
-        <revremark>Updated for mod_log_sql v1.96</revremark>
-      </revision>
-      <revision>
         <revnumber>1.0</revnumber>
         <date>2004-01-22</date>
         <revremark>Initial Conversion from Lyx to Docbook</revremark>
       </revision>
     </revhistory>
   </articleinfo>
-  <sect1>
+  <sect1 id="intro">
     <title>Introduction</title>
     <sect2>
       <title>Summary</title>
-      <para>This Apache module will permit you to log to a SQL database; it can log each access request as well as data associated with each request: cookies, notes, and inbound/outbound headers. Unlike logging to a flat text file -- which is standard in Apache -- a SQL-based log exhibits tremendous flexibility and power of data extraction. (See FAQ entry <xref linkend="FAQ.WhyLogToSQL"/> for further discussion and examples of the advantages to SQL.)</para>
+      <para>This Apache module will permit you to log to a SQL database; it can log each access request as well as data associated with each request: cookies, notes, and inbound/outbound headers. Unlike logging to a flat text file -- which is standard in Apache -- a SQL-based log exhibits tremendous flexibility and power of data extraction. (See section [sub:why] in the FAQ for further discussion and examples of the advantages to SQL.)</para>
       <para>This module can either replace or happily coexist with mod_log_config, Apache's text file logging facility. In addition to being more configurable than the standard module, mod_log_sql is much more flexible.</para>
     </sect2>
-    <sect2>
+    <sect2 id="copyright">
       <title>Approach</title>
       <para>This project was formerly known as "mod_log_mysql." It was renamed "mod_log_sql" in order to reflect the project goal of database in-specificity. The module currently supports MySQL, but support for other database back-ends is underway.</para>
       <para>In order to save speed and overhead, links are kept alive in between queries. This module uses one dedicated SQL link per httpd child, opened by each child process when it is born. Among other things, this means that this module supports logging into only one MySQL server, and for now, also, only one SQL database. But that's a small tradeoff compared to the blinding speed of this module. Error reporting is robust throughout the module and will inform the administrator of database issues in the Apache ErrorLog for the server/virtual server.</para>
       <para>Virtual hosts are supported in the same manner they are in the regular logging modules. The administrator defines some basic 'global' directives in the main server config, then defines more specific 'local' directives inside each VirtualHost stanza.</para>
-      <para>A robust "preserve" capability has now been implemented. This permits the module to preserve any failed INSERT commands to a local file on its machine. In any situation that the database is unavailable -- e.g. the network fails or the database host is rebooted -- mod_log_sql will note this in the error log and begin appending its log entries to the preserve file (which is created with the user and group ID of the running Apache process, e.g. "nobody/nobody" on many Linux installations). When database availability returns, mod_log_sql seamlessly resumes logging to it. When convenient for the sysadmin, he/she can easily import the preserve file into the database because it is simply a series of SQL insert statements.</para>
+      <para>A robust "preserve" capability has now been implemented. This permits the module to preserve any failed INSERT commands to a local file on its machine. In any situation that the database is unavailable -- e.g. the network fails or the database host is rebooted -- mod_log_sql will note this in the error log and begin appending its log entries to the preserve file (which is created with the user &amp; group ID of the running Apache process, e.g. "nobody/nobody" on many Linux installations). When database availability returns, mod_log_sql seamlessly resumes logging to it. When convenient for the sysadmin, he/she can easily import the preserve file into the database because it is simply a series of SQL insert statements.</para>
     </sect2>
     <sect2>
       <title>What gets logged by default?</title>
-      <para>All the data that would be contained in the "Combined Log Format" is logged by default, plus a little extra. Your best bet is to begin by accepting this default, then later customize the log configuration based on your needs. The documentation of the run-time directives includes a full explanation of what you can log, including examples -- see section <xref endterm="Sect.ConfigReference.title" linkend="Sect.ConfigReference"/>.</para>
+      <para>All the data that would be contained in the "Combined Log Format" is logged by default, plus a little extra. Your best bet is to begin by accepting this default, then later customize the log configuration based on your needs. The documentation of the run-time directives includes a full explanation of what you can log, including examples -- see section [sec:ConfRef].</para>
     </sect2>
     <sect2>
       <title>Miscellaneous Notes</title>
@@ -98,12 +84,7 @@
       <para>The actual logging code was taken from the already existing flat file text modules, so all that credit goes to the Apache Software Foundation.</para>
       <para>The MySQL routines and directives were added by Zeev Suraski &lt;bourbon@netvision.net.il&gt;. </para>
       <para>All changes from 1.06+ and the new documentation were added by Chris Powell <email>chris &lt;at&gt; grubbybaby &lt;dot&gt; com</email>. It seems that the module had fallen into the "un-maintained" category -- it had not been updated since 1998 -- so Chris adopted it as the new maintainer.</para>
-      <para>In December of 2003, Edward Rudd &EmailContact; porting the module to Apache 2.0, cleaning up the code, converting the documentation to DocBook, optimizing the main logging loop, and added the much anticipated database abstraction layer.</para>
-      <para>As of February 2004, Chris Powell handed over maintenance of the module over to Edward Rudd. So you should contact Edward Rudd about the module from now on.</para>
-    </sect2>
-    <sect2 id="Sect.MailingLists">
-      <title id="Sect.MailingLists.title">Mailing Lists</title>
-      <para>A general discussion and support mailing list is provided for mod_log_sq at lists.outoforder.cc. To subscribe to the mailing list send a blank e-mail to mod_log_sql-subscribe@lists.outoforder.cc. The list archives can be accessed via Gmane.org's mailng list gateway via any new reader <ulink url="news://news.gmane.org/gmane.comp.apache.mod-log-sql">news://news.gmane.org/gmane.comp.apache.mod-log-sql</ulink>, or via a web browser at <ulink url="http://news.gmane.org/gmane.comp.apache.mod-log-sql">http://news.gmane.org/gmane.comp.apache.mod-log-sql</ulink>.</para>
+      <para>In December of 2003, Edward Rudd <email>eddie &lt;at&gt; omegaware &lt;dot&gt; com</email> porting the module to Apache 2.0, cleaning up the code, converting the documentation to DocBook, optimizing the main logging loop, and added the much anticipated database abstraction layer.</para>
     </sect2>
   </sect1>
   <sect1>
@@ -129,7 +110,48 @@
       </itemizedlist>
     </sect2>
     <sect2>
-      <title>Compiling and Installing</title>
+      <title>Platform Specific Notes</title>
+      <para><remark>This section is currently not applicable as the new autoconf setup should autodetect everything for your server..Win32 system, however, need to be updated.</remark>These installation documents assume a relatively modern GNU/Linux scenario. mod_log_sql has been ported to other platforms; following are notes on compiling the module for those platforms.</para>
+      <sect3>
+        <title>&lt;sub:Solaris&gt;Solaris</title>
+        <para>The nanosleep() function used in mod_log_sql relies on linking aginst the librt library. Make the following alterations before proceeding: </para>
+        <orderedlist>
+          <listitem>
+            <para>In Makefile, search for the string "-lmysqlclient -lz" and change it to read "-lmysqlclient -lz -lrt"</para>
+          </listitem>
+          <listitem>
+            <para> In part [step:Linking] of section [sec:Static] below, change "-lmysqlclient -lm -lz" to read "-lmysqlclient -lm -lz -lrt"</para>
+          </listitem>
+        </orderedlist>
+      </sect3>
+      <sect3>
+        <title>BSD</title>
+        <para>No notes are available at present, but they are desired. If you have successfully ported mod_log_sql to BSD, please contact [(chris@grubbybaby.com)||the maintaniner, Chris Powell] and help fill in this section.</para>
+      </sect3>
+      <sect3>
+        <title>Win32</title>
+        <para>No notes are available at present, but they are desired. If you have successfully ported mod_log_sql to Win32, please contact [(chris@grubbybaby.com)||the maintaniner, Chris Powell] and help fill in this section.</para>
+      </sect3>
+      <sect3>
+        <title>OS X</title>
+        <para>mod_log_sql should compile and work out-of-the-box on this platform. Here are some notes from a user successfully running the module on OS X:</para>
+        <para>The only changes I had to make were to where I had the various libraries installed. Here are the changes I made to the head of the Makefile: APACHESOURCE = /usr/local/src/apache_1.3.27 (Wasn't sure if this was really needed or not, so I downloaded the Apache source just in case) APACHEINSTALLED = /usr/sbin APACHEHEADERS = /usr/include/httpd APXS = $(APACHEINSTALLED)/apxs MYSQLLIBRARIES = /usr/local/mysql/lib MYSQLHEADERS = /usr/local/mysql/include I'm using a binary installation of MySQL and the default apache installation on OS X Client 10.2.3, the locations of these files may vary depending on how you've installed MySQL and will almost certainly be different if you're using OS X Server.</para>
+        <para> My thanks to Tom Wiebe for being the first (to my knowlege) mod_log_sql user on OS X and for providing these notes.</para>
+      </sect3>
+      <sect3>
+        <title>Digital Unix</title>
+        <para>Digital Unix, like Solaris, needs to be linked against librt; see section [sub:Solaris]. Here are further notes from a user successfully running the module on Digital Unix:</para>
+        <para>Instead of trying to get the module to remember where the MySQL libraries were, I instead compiled apache with the information: LDFLAGS='-rpath /isp/mysql/lib/mysql' ./configure ... Everything worked as expected after that. (The error I got without this was "/sbin/loader: Fatal Error: cannot map libmysqlclient.so" ) Digital Unix (v4.0f, at least ) appears to follow the same requirements needed by Solaris, so simply adding librt to the module made it compile without errors. As for the warnings, here's the text: mod_log_sql.c: In function `extract_request_duration': mod_log_sql.c:292: warning: long int format, different type arg (arg 4) mod_log_sql.c: In function `extract_request_timestamp': mod_log_sql.c:497: warning: long int format, different type arg (arg 4) Poking around in the code, it looks like the compiler was complaining that what time() is returning doesn't play nicely with %ld by default. I just typecast them as (long)'s and the warnings went away ( not that the module wasn't working correctly without them ). The module works very well so far in testing... hasn't dropped a single log entry yet. </para>
+        <para>My thanks to Jim Turner for permitting me to quote him here, and for being the first known user of mod_log_sql on Digital Unix</para>
+      </sect3>
+    </sect2>
+    <sect2>
+      <title>Do I want a DSO or a static module</title>
+      <para><remark>This section is no longer applicable, as the new autoconf setup only allows DSO with Apache 1.3 and 2.0.</remark>You need to know the answer to this question before you proceed. The answer is pretty straightforward: what have you done in the past? If you like all your Apache modules to be dynamic, then you should keep doing that. If you're more of an old-school type and prefer to compile the modules right into apache, do that. Both methods work equally well. </para>
+      <para>FWIW, the DSO method is more modern and increasing in popularity because apxs takes care of a lot of dirty little details for you. As you'll see below, the static-module method is a little more complex.</para>
+    </sect2>
+    <sect2>
+      <title>Installation as an Apache DSO (preferred)</title>
       <orderedlist>
         <listitem>
           <para>Unpack the archive into a working directory.</para>
@@ -155,7 +177,7 @@ $ cd mod_log_sql-1.9</screen>
               <listitem>
                 <para>This is the directory to search for the <filename>libmysqlclient</filename> library and the <application>MySQL</application> headers.</para>
                 <para>The default is to search <filename>/usr/include</filename>, <filename>/usr/include/mysql</filename>, <filename>/usr/local/include</filename>, and <filename>/usr/local/include/mysql</filename> for <application>MySQL</application> headers.. And <filename>/usr/lib</filename>. <filename>/usr/lib/mysql</filename>, <filename>/usr/local/lib</filename>, and <filename>/usr/local/lin/mysql</filename> for the <application>MySQL</application> libraries.</para>
-                <para>Specifying this testargument will search $directory/include and $directory/mysql for <application>MySQL</application> headers. And $directory/lib and $directory/lib/mysql for <application>MySQL</application> libraries.</para>
+                <para>Specifying this argument will search $directory/include and $directory/mysql for <application>MySQL</application> headers. And $directory/lib and $directory/lib/mysql for <application>MySQL</application> libraries.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -179,8 +201,7 @@ $ cd mod_log_sql-1.9</screen>
                 <screen format="linespecific">$ locate ndbm.h
 /usr/include/db1/ndbm.h
 /usr/include/gdbm/ndbm.h</screen>
-                <para>As far as I can tell, there is no difference as to which you specify, but it should be the one that you compiled mod_ssl with.</para>
-                <para>The default is <filename>/usr/include/db1</filename>, which should work on most systems.</para>
+                <para>As far as I can tell, there is no difference as to which you specify, but it should be the one that you compiled mod_ssl with. If unsure specify the <filename>/usr/include/db1</filename>.</para>
               </listitem>
             </varlistentry>
             <varlistentry>
@@ -199,23 +220,20 @@ $ cd mod_log_sql-1.9</screen>
         </listitem>
         <listitem>
           <para>Now compile the module with GNU make. You may have to specify gmake on some systems like FreeBSD.</para>
-          <screen>$ gmake</screen>
+          <screen>$ make</screen>
         </listitem>
         <listitem>
           <para>If there were no errors, you can now install the module(s). If you compiled as a non-root user you may need to switch users with <application>su</application> or <application>sudo</application>.</para>
-          <screen>$ su -c "gmake install"
+          <screen>$ su -c "make install"
 Password:</screen>
         </listitem>
         <listitem>
           <para>Now edit your Apache configuration and load the modules.</para>
           <remark>If you are loading the SSL logging module, you need to make sure it is loaded after mod_ssl and mod_log_sql.</remark>
-          <remark>If you have previously used mod_log_sql version 1.18, the name of the module has changed from sql_log_module to log_sql_module (the first parameter to LoadModule)</remark>
-          <remark>If you are upgrading from any release earlier than 1.97 you need to add an extra LoadModule directive to load the database driver (ie mysql).</remark>
           <orderedlist>
             <listitem>
               <para>Insert these lines to either the main <filename>httpd.conf</filename> or a file included via an include directive.</para>
               <programlisting>LoadModule log_sql_module modules/mod_log_sql.so
-LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so
 &lt;IfModule mod_ssl.c&gt;
 LoadModule log_sql_ssl_module moduels/mod_log_sql_ssl.so
 &lt;/IfModule&gt;</programlisting>
@@ -224,7 +242,6 @@ LoadModule log_sql_ssl_module moduels/mod_log_sql_ssl.so
             <listitem>
               <para>If you are using Apache 1.3 you may need add these lines later in the configuration.</para>
               <programlisting>AddModule mod_log_sql.c
-AddModule mod_log_sql_mysql.c
 &lt;IfModule mod_ssl.c&gt;
 AddModule mod_log_sql_ssl.c
 &lt;/IfModule&gt;</programlisting>
@@ -235,12 +252,12 @@ AddModule mod_log_sql_ssl.c
       </orderedlist>
     </sect2>
   </sect1>
-  <sect1 id="Sect.Configuration">
-    <title id="Sect.Configuration.title">Configuration</title>
-    <sect2 id="Sect.Preperation">
-      <title id="Sect.Preperation.title">Preparing MySQL for logging</title>
+  <sect1>
+    <title>&lt;sec:Configuration&gt;Configuration</title>
+    <sect2>
+      <title>&lt;sub:PrepDb&gt;Preparing MySQL for logging</title>
       <para>You have to prepare the database to receive data from <application>mod_log_sql</application>, and set up run-time directives in <filename>httpd.conf</filename> to control how and what <application>mod_log_sql</application> logs.</para>
-      <para>This section will discuss how to get started with a basic configuration. Full documentation of all available run-time directives is available in section <xref endterm="Sect.ConfigReference.title" linkend="Sect.ConfigReference"/>.</para>
+      <para>This section will discuss how to get started with a basic configuration. Full documentation of all available run-time directives is available in section [sec:ConfRef].</para>
       <orderedlist>
         <listitem>
           <para>mod_log_sql can make its own tables on-the-fly, or you can pre-make the tables by hand. The advantage of letting the module make the tables is ease-of-use, but for raw performance you will want to pre-make the tables in order to save some overhead. In this basic setup we'll just let the module create tables for us.</para>
@@ -251,8 +268,8 @@ AddModule mod_log_sql_ssl.c
 Enter password:
 mysql&gt; create database apachelogs;</screen>
         </listitem>
-        <listitem id="Item.CreateTable">
-          <para>If you want to hand-create the tables, run the enclosed 'create-tables' SQL script as follows ("create_tables.sql" needs to be in your current working directory).</para>
+        <listitem>
+          <para>&lt;part:CrTbl&gt;If you want to hand-create the tables, run the enclosed 'create-tables' SQL script as follows ("create_tables.sql" needs to be in your current working directory).</para>
           <screen>mysql&gt; use apachelogs
 Database changed
 mysql&gt; source create_tables.sql</screen>
@@ -262,11 +279,11 @@ mysql&gt; source create_tables.sql</screen>
           <screen>mysql&gt; grant insert,create on apachelogs.* to loguser@my.apachemachine.com identified by 'l0gger';</screen>
         </listitem>
         <listitem>
-          <para>You may be especially security-paranoid and want "loguser" to not have "create" capability within the "apachelogs" database. You can disable that privilege, but the cost is that you will not be able to use the module's on-the-fly table creation feature. If that cost is acceptable, hand-create the tables as described in step <xref linkend="Item.CreateTable"/> and use the following GRANT statement instead of the one above:</para>
+          <para>You may be especially security-paranoid and want "loguser" to not have "create" capability within the "apachelogs" database. You can disable that privilege, but the cost is that you will not be able to use the module's on-the-fly table creation feature. If that cost is acceptable, hand-create the tables as described in step [part:CrTbl] and use the following GRANT statement instead of the one above:</para>
           <screen>mysql&gt; grant insert on apachelogs.* to loguser@my.apachemachine.com identified by 'l0gger';</screen>
         </listitem>
-        <listitem id="Item.EnableLogging">
-          <para>Enable full logging of your <application>MySQL</application> daemon (at least temporarily for debugging purposes) if you don't do this already. Edit /etc/my.cnf and add the following line to your [mysqld] section:</para>
+        <listitem>
+          <para>&lt;step:EnaLog&gt;Enable full logging of your <application>MySQL</application> daemon (at least temporarily for debugging purposes) if you don't do this already. Edit /etc/my.cnf and add the following line to your [mysqld] section:</para>
           <programlisting>log=/var/log/mysql-messages</programlisting>
           <para>Then restart <application>MySQL</application></para>
           <screen># /etc/rc.d/init.d/mysql restart</screen>
@@ -282,13 +299,14 @@ mysql&gt; source create_tables.sql</screen>
           <para>Use the <application>MySQL</application> database called "apachelogs" running on "dbmachine.foo.com". Use username "loguser" and password "l0gg3r" to authenticate to the database. Permit the module create tables for us.</para>
           <example>
             <title>Basic Example</title>
-            <programlisting>LogSQLLoginInfo mysql://loguser:l0gg3r@dbmachine.foo.com/apachelogs 
+            <programlisting>LogSQLLoginInfo dbmachine.foo.com loguser l0gg3r 
+LogSQLDatabase apachelogs
 LogSQLCreateTables on</programlisting>
           </example>
           <para>If your database resides on localhost instead of another host, specify the MySQL server's socket file as follows:</para>
-          <programlisting>LogSQLDBParam socketfile /your/path/to/mysql.sock</programlisting>
+          <programlisting>LogSQLSocketFile /your/path/to/mysql.sock</programlisting>
           <para>If your database is listening on a port other than 3306, specify the correct TCP port as follows:</para>
-          <programlisting>LogSQLDBParam port 1234</programlisting>
+          <programlisting>LogSQLTCPPort 1234</programlisting>
         </listitem>
         <listitem>
           <para>The actual logging is set up on a virtual-host-by-host basis. So, skip down to the virtual host you want to set up. Instruct this virtual host to log entries to the table "access_log" by inserting a LogSQLTransferLogTable directive. (The LogSQLTransferLogTable directive is the minimum required to log -- other directives that you will learn about later simply tune the module's behavior.)</para>
@@ -312,7 +330,7 @@ LogSQLCreateTables on</programlisting>
           <para>Visit your web site in a browser to trigger some hits, then confirm that the entries are being successfully logged:</para>
           <screen># mysql -hdbmachine.foo.com -umysqladmin -p -e "select * from access_log" apachelogs 
 Enter password:</screen>
-          <para>Several lines of output should follow, corresponding to your hits on the site. You now have basic functionality. Don't disable your regular Apache logs until you feel comfortable that the database is behaving as you'd like and that things are going well. If you do not see any entries in the access_log, please consult section <xref linkend="FAQ.NothingLogged"/> of the FAQ on how to debug and fix the situation.</para>
+          <para>Several lines of output should follow, corresponding to your hits on the site. You now have basic functionality. Don't disable your regular Apache logs until you feel comfortable that the database is behaving as you'd like and that things are going well. If you do not see any entries in the access_log, please consult section [faq:NothingLogged] of the FAQ on how to debug and fix the situation.</para>
         </listitem>
         <listitem>
           <para>You can now activate the advanced features of mod_log_sql, which are described in the next section.</para>
@@ -324,7 +342,7 @@ Enter password:</screen>
       <sect3>
         <title>Instructing the module what to log</title>
         <para>The most basic directive for the module is LogSQLTransferLogFormat, which tells the module which information to send to the database; logging to the database will not take place without it. Place a LogSQLTransferLogFormat directive in the VirtualHost stanza of each virtual host that you want to activate.</para>
-        <para>After LogSQLTransferLogFormat you supply a string of characters that tell the module what information to log. In the configuration directive reference (section <xref linkend="Conf.LogSQLTransferLogFormat"/>) there is a table which clearly defines all the possible things to log. Let's say you want to log only the "request time," the "remote host," and the "request"; you'd use:</para>
+        <para>After LogSQLTransferLogFormat you supply a string of characters that tell the module what information to log. In the configuration directive reference (section [sub:Frmat]) there is a table which clearly defines all the possible things to log. Let's say you want to log only the "request time," the "remote host," and the "request"; you'd use:</para>
         <programlisting>LogSQLTransferLogFormat hUS</programlisting>
         <para>But a more appropriate string to use is</para>
         <programlisting>LogSQLTransferLogFormat AbHhmRSsTUuv</programlisting>
@@ -340,8 +358,8 @@ Enter password:</screen>
           </listitem>
         </itemizedlist>
       </sect3>
-      <sect3 id="Sect.Ignore">
-        <title id="Sect.Ignore.title" xreflabel="Using Filtering Directives">Instructing the module what NOT to log using filtering directives</title>
+      <sect3>
+        <title>&lt;sub:Ignore&gt;Instructing the module what NOT to log using filtering directives</title>
         <para>One "accept" and two "ignore" directives allow you to fine-tune what the module should not log. These are very handy for keeping your database as uncluttered as possible and keeping your statistics free of unneeded numbers. Think of each one as a gatekeeper.</para>
         <para><emphasis>It is important to remember that each of these three directives is purely optional. mod_log_sql's default is to log everything.</emphasis></para>
         <para>When a request comes in, the contents of LogSQLRequestAccept are evaluated first. This optional, "blanket" directive lets you specify that only certain things are to be accepted for logging, and everything else discarded. Because it is evaluated before LogSQLRequestIgnore and LogSQLRemhostIgnore it can halt logging before those two filtering directives "get their chance." </para>
@@ -408,8 +426,8 @@ LogSQLRequestIgnore statistics.html bluedot.jpg</programlisting>
         <para>There are numerous benefits. The admin will not need to create new tables for every new VirtualHost. (Although the admin will still need to drop the tables of virtual hosts that are removed.) The admin will not need to set LogSQLTransferLogTable for each virtual host -- it will be configured automatically based on the host's name. Because each virtual host will log to its own segregated table, data about one virtual server will segregate from others; an admin can grant users access to the tables they need, and they will be unable to view data about another user's virtual host.</para>
         <para>In an ISP scenario the admin is likely to have a cluster of many front-end webservers logging to a back-end database. mod_log_sql has a feature that permits analysis of how well the web servers are loadbalancing: the LogSQLMachineID directive. The administrator uses this directive to assign a unique identifier to each machine in the web cluster, e.g. "LogSQLMachineID web01," "LogSQLMachineID web02," etc. Used in conjunction with the 'M' character in LogSQLTransferLogFormat, each entry in the SQL log will include the machine ID of the machine that created the entry. This permits the administrator to count the entries made by each particular machine and thereby analyze the front-end loadbalancing algorithm.</para>
       </sect3>
-      <sect3 id="Sect.MultiTable">
-        <title id="Sect.MultiTable.title">Logging many-to-one data in separate tables</title>
+      <sect3>
+        <title>&lt;secMulTable&gt;Logging many-to-one data in separate tables</title>
         <para>A given HTTP request can have a one-to-many relationship with certain kinds of data. For example, a single HTTP request can have 4 cookies, 3 headers and 5 "mod_gzip" notes associated with it. mod_log_sql is capable of logging these relationships due to the elegance of SQL relational data.</para>
         <para>You already have a single table containing access requests. One of the columns in that table is 'id' which is intended to contain the unique request ID supplied by the standard Apache module mod_unique_id -- all you need to do is compile in that module and employ the LogSQLTransferLogFormat character 'I'. Thereafter, each request gets a unique ID that can be thought of as a primary key within the database, useful for joining multiple tables. So let's envision several new tables: a notes table, a cookies table, and a table for inbound and outbound headers.</para>
         <table>
@@ -573,8 +591,8 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
         <para>It is wasteful and potentially confusing to permit this internal test data to clutter the database, and a solution to the problem is the proper use of the LogSQLMachineID directive. Assume a scenario where the production webservers have IDs like "web01," "web02," and so on -- and the test webservers have IDs like "test01," "test02," etc. Because entries in the log database are distinguished by their source machine, an administrator may purge unneeded test data from the access log as follows:</para>
         <programlisting>delete from access_log where machine_id like 'test%';</programlisting>
       </sect3>
-      <sect3 id="Sect.DelayedInsert">
-        <title id="Sect.DelayedInsert.title">Optimizing for a busy database</title>
+      <sect3>
+        <title>&lt;sub:DelayedIns&gt;Optimizing for a busy database</title>
         <para>A busy MySQL database will have SELECT statements running concurrently with INSERT and UPDATE statements. A long-running SELECT can in certain circumstances block INSERTs and therefore block mod_log_sql. A workaround is to enable mod_log_sql for "delayed inserts," which are described as follows in the MySQL documentation.</para>
         <para>The DELAYED option for the INSERT statement is a MySQL-specific option that is very useful if you have clients that can't wait for the INSERT to complete. This is a common problem when you use MySQL for logging and you also periodically run SELECT and UPDATE statements that take a long time to complete. DELAYED was introduced in MySQL Version 3.22.15. It is a MySQL extension to ANSI SQL92.</para>
         <para>INSERT DELAYED only works with ISAM and MyISAM tables. Note that as MyISAM tables supports concurrent SELECT and INSERT, if there is no free blocks in the middle of the data file, you very seldom need to use INSERT DELAYED with MyISAM. </para>
@@ -590,687 +608,404 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
           </listitem>
         </orderedlist>
         <warning>
-          <para>The MySQL documentation concludes, "This means that you should only use INSERT DELAYED when you are really sure you need it!" Furthermore, the current state of error return from a failed INSERT DELAYED seems to be in flux, and may behave in unpredictable ways between different MySQL versions. See FAQ entry <xref linkend="FAQ.DelayedInsert"/> -- you have been warned.</para>
+          <para>The MySQL documentation concludes, "This means that you should only use INSERT DELAYED when you are really sure you need it!" Furthermore, the current state of error return from a failed INSERT DELAYED seems to be in flux, and may behave in unpredictable ways between different MySQL versions. See section [sub:DelayedInsFAQ] in the FAQ -- you have been warned.</para>
         </warning>
         <para>If you are experiencing issues which could be solved by delayed inserts, then set LogSqlDelayedInserts On in the <filename>httpd.conf</filename>. All regular INSERT statements are now INSERT DELAYED, and you should see no more blocking of the module.</para>
       </sect3>
     </sect2>
-    <sect2 id="Sect.ConfigReference">
-      <title id="Sect.ConfigReference.title">Configuration Directive Reference</title>
+    <sect2>
+      <title>&lt;sec:ConfRef&gt;Configuration directive reference</title>
       <para>It is imperative that you understand which directives are used only once in the main server config, and which are used inside VirtualHost stanzas and therefore multiple times within httpd.conf. The "context" listed with each entry informs you of this.</para>
-      <sect3>
-        <title>DataBase Configuration</title>
-        <variablelist>
-          <varlistentry>
-            <term>LogSQLLoginInfo</term>
-            <listitem>
-              <cmdsynopsis>
-                <command>LogSQLLoginInfo</command>
-                <arg choice="req"><replaceable>connection URI</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLLoginInfo mysql://logwriter:passw0rd@foobar.baz.com/Apache_log</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>Defines the basic connection URI to connect to the database with. The format of the connection URI is</para>
-              <simpara>driver://username[:password]@hostname[:port]/database</simpara>
-              <variablelist>
-                <varlistentry>
-                  <term>driver</term>
-                  <listitem>
-                    <simpara>The database driver to use (mysql, pgsql, etc..)</simpara>
-                  </listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>username</term>
-                  <listitem>
-                    <simpara>The database username to login with INSERT privileges on the logging table defined in LogSQLtransferLogTable.</simpara>
-                  </listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>password</term>
-                  <listitem>
-                    <simpara>The password to use for username, and can be omitted if there is no password.</simpara>
-                  </listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>hostname</term>
-                  <listitem>
-                    <simpara>The hostname or Ip address of the Database machine, ans is simple "localhost" if the database lives on the same machine as Apache.</simpara>
-                  </listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>port</term>
-                  <listitem>
-                    <simpara>Port on hostname to connect to the Database, if not specified use the default port for the database.</simpara>
-                  </listitem>
-                </varlistentry>
-                <varlistentry>
-                  <term>database</term>
-                  <listitem>
-                    <simpara>The database to connect to on the server.</simpara>
-                  </listitem>
-                </varlistentry>
-              </variablelist>
-              <note>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-                <para>This directive Must be defined for logging to be enabled.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLDBParam</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLDBParam</command>
-                <arg choice="req" rep="norepeat"><replaceable>parameter-name</replaceable></arg>
-                <arg choice="req" rep="norepeat"><replaceable>value</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLDBParam socketfile /var/lib/mysql/mysql.socket</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>This is the new method of specifying Database connection credentials and settings. This is used to define database driver specific options. For a list of options read the documentation for each specific database driver.</para>
-              <note>
-                <para>Each parameter-name may only be defined once.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLCreateTables</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLCreateTables</command>
-                <arg choice="req" rep="norepeat">flag</arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLCreateTables On</simpara>
-              <simpara>Default: Off</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>mod_log_sql has the ability to create its tables on-the-fly. The advantage to this is convenience: you don't have to execute any SQL by hand to prepare the table. This is especially helpful for people with lots of virtual hosts (who should also see the LogSQLMassVirtualHosting directive).</para>
-              <para>There is a slight disadvantage: if you wish to activate this feature, then the userid specified in LogSQLLoginInfo must have CREATE privileges on the database. In an absolutely paranoid, locked-down situation you may only want to grant your mod_log_sql user INSERT privileges on the database; in that situation you are unable to take advantage of LogSQLCreateTables. But most people -- even the very security-conscious -- will find that granting CREATE on the logging database is reasonable.</para>
-              <note>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLForcePreserve</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLForcePreserve</command>
-                <arg choice="req" rep="norepeat">flag</arg>
-              </cmdsynopsis>
-              <simpara>Example: LogForcePreserve On</simpara>
-              <simpara>Default: Off</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>You may need to perform debugging on your database and specifically want mod_log_sql to make no attempts to log to it. This directive instructs the module to send all its log entries directly to the preserve file and to make no database INSERT attempts.</para>
-              <para>This is presumably a directive for temporary use only; it could be dangerous if you set it and forget it, as all your entries will simply pile up in the preserve file.</para>
-              <note>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLMachineID</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLMachineID</command>
-                <arg choice="req" rep="norepeat">machineID</arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLMachineID web01</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>If you have a farm of webservers then you may wish to know which particular machine made each entry; this is useful for analyzing your load-balancing methodology. LogSQLMachineID permits you to distinguish each machine's entries if you assign each machine its own LogSQLMachineID: for example, the first webserver gets ``LogSQLMachineID web01,'' the second gets ``LogSQLMachineID web02,'' etc.</para>
-              <note>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQlPreserveFile</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLPreserveFile</command>
-                <arg choice="req" rep="norepeat"><replaceable>filename</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLPreserveFile offline-preserve</simpara>
-              <simpara>Default: /tmp/sql-preserve</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>mod_log_sql writes queries to this local preserve file in the event that it cannot reach the database, and thus ensures that your high-availability web frontend does not lose logs during a temporary database outage. This could happen for a number of reasons: the database goes offline, the network breaks, etc. You will not lose entries since the module has this backup. The file consists of a series of SQL statements that can be imported into your database at your convenience; furthermore, because the SQL queries contain the access timestamps you do not need to worry about out-of-order data after the import, which is done in a simple manner:</para>
-              <screen format="linespecific"># mysql -uadminuser -p mydbname &lt; /tmp/sql-preserve</screen>
-              <para>If you do not define LogSQLPreserveFile then all virtual servers will log to the same default preserve file (<filename moreinfo="none">/tmp/sql-preserve</filename>). You can redefine this on a virtual-host basis in order to segregate your preserve files if you desire. Note that segregation is not usually necessary, as the SQL statements that are written to the preserve file already distinguish between different virtual hosts if you include the 'v' character in your LogSQLTransferLogFormat directive. It is only necessary to segregate preserve-files by virualhost if you also segregate access logs by virtualhost.</para>
-              <para>The module will log to Apache's ErrorLog when it notices a database outage, and upon database return. You will therefore know when the preserve file is being used, although it is your responsibility to import the file.</para>
-              <para>The file does not need to be created in advance. It is safe to remove or rename the file without interrupting Apache, as the module closes the filehandle immediately after completing the write. The file is created with the user &amp; group ID of the running Apache process (e.g. 'nobody' on many Linux distributions).</para>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </sect3>
-      <sect3>
-        <title>Table Names</title>
-        <variablelist>
-          <varlistentry>
-            <term>LogSQLTransferLogTable</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLTransferLogTable</command>
-                <arg choice="req" rep="norepeat"><replaceable>table-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLTransferLogTable access_log_table</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines which table is used for logging of Apache's transfers; this is analogous to Apache's TransferLog directive. table-name must be a valid table within the database defined in the LogSQLLoginInfo connection URI.</para>
-              <para>This directive is <emphasis>not</emphasis> necessary if you declare LogSQLMassVirtualHosting On, since that directive activates dynamically-named tables. If you attempt to use LogSqlTransferlogTable at the same time a warning will be logged and it will be ignored, since LogSQLMassVirtualHosting takes priority.</para>
-              <note>
-                <para>Requires unless LogSQLMassVirtualHosting is set to On</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLCookieLogTable</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLCookieLogTable</command>
-                <arg choice="req" rep="norepeat"><replaceable></replaceable>table-name</arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLCookieLogTable cookie_log</simpara>
-              <simpara>Default: cookies</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines which table is used for logging of cookies. Working in conjunction with LogSQLWhichCookies, you can log many of each request's associated cookies to a separate table. For meaningful data retrieval the cookie table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
-              <note>
-                <para>You must create the table (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to "on".</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLHeadersInLogTable</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLHeadersInLogTable</command>
-                <arg choice="req" rep="norepeat"><replaceable>table-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLHeadersInLogTable headers</simpara>
-              <simpara>Default: headers_in</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines which table is used for logging of inbound headers. Working in conjunction with LogSQLWhichHeadersIn, you can log many of each request's associated headers to a separate table. For meaningful data retrieval the headers table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
-              <note>
-                <para>Note that you must create the table (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to "on".</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLHeadersOutLogTable</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLHeadersOutLogTable</command>
-                <arg choice="req" rep="norepeat"><replaceable>table-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLHeadersOutLogTable headers</simpara>
-              <simpara>Default: headers_out</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines which table is used for logging of outbound headers. Working in conjunction with LogSQLWhichHeadersOut, you can log many of each request's associated headers to a separate table. For meaningful data retrieval the headers table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
-              <note>
-                <para>Note that you must create the table (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to "on".</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLNotesLogTable</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLNotesLogTable</command>
-                <arg choice="req" rep="norepeat"><replaceable>table-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLNotesLogTable notes-log</simpara>
-              <simpara>Default: notes</simpara>
-              <simpara>Context: virtual_host</simpara>
-              <para>Defines which table is used for logging of notes. Working in conjunction with LogSQLWhichNotes, you can log many of each request's associated notes to a separate table. For meaningful data retrieval the notes table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
-              <note>
-                <para>This table must be created (see create-tables.sql included in the package), or LogSQLCreateTables must be set to 'On'.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLMassVirtualHosting</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLMassVirtualHosting</command>
-                <arg choice="req" rep="norepeat">flag</arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLMassVirtualHosting On</simpara>
-              <simpara>Default: Off</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>If you administer a site hosting many, many virtual hosts then this option will appeal to you. If you turn on LogSQLMassVirtualHosting then several things happen:</para>
-              <itemizedlist>
-                <listitem>
-                  <para>the on-the-fly table creation feature is activated automatically</para>
-                </listitem>
-                <listitem>
-                  <para>the transfer log table name is dynamically set from the virtual host's name after stripping out SQL-unfriendly characters (example: a virtual host www.grubbybaby.com gets logged to table access_www_grubbybaby_com)</para>
-                </listitem>
-                <listitem>
-                  <para>which, in turn, means that each virtual host logs to its own segregated table. Because there is no data shared between virtual servers you can grant your users access to the tables they need; they will be unable to view others' data.</para>
-                </listitem>
-              </itemizedlist>
-              <para>This is a huge boost in convenience for sites with many virtual servers. Activating LogSQLMassVirtualHosting obviates the need to create every virtual server's table and provides more granular security possibilities.</para>
-              <note>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </sect3>
-      <sect3>
-        <title>Configuring What Is logged</title>
-        <variablelist>
-          <varlistentry id="Conf.LogSQLTransferLogFormat">
-            <term>LogSQLTransferLogFormat </term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLTransferLogFormat</command>
-                <arg choice="req" rep="norepeat"><replaceable>format-string</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLTransferLogFormat huSUTv</simpara>
-              <simpara>Default: AbHhmRSsTUuv</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Each character in the format-string defines an attribute of the request that you wish to log. The default logs the information required to create Combined Log Format logs, plus several extras. Here is the full list of allowable keys, which sometimes resemble their Apache counterparts, but do not always:</para>
-              <table>
-                <title>Core LogFormat parameters</title>
-                <tgroup cols="5">
-                  <colspec colname="1" colnum="1"/>
-                  <colspec colname="2" colnum="2"/>
-                  <colspec colname="3" colnum="3"/>
-                  <colspec colname="4" colnum="4"/>
-                  <colspec colname="5" colnum="5"/>
-                  <thead>
-                    <row>
-                      <entry colname="1">Symbol</entry>
-                      <entry colname="2">Meaning</entry>
-                      <entry colname="3">DB Field</entry>
-                      <entry colname="4">Data Type</entry>
-                      <entry colname="5">Example</entry>
-                    </row>
-                  </thead>
-                  <tbody>
-                    <row>
-                      <entry colname="1">A</entry>
-                      <entry colname="2">User Agent</entry>
-                      <entry colname="3">agent</entry>
-                      <entry colname="4">varchar(255)</entry>
-                      <entry colname="5">Mozilla/4.0 (compat; MSIE 6.0; Windows)</entry>
-                    </row>
-                    <row>
-                      <entry colname="1">a</entry>
-                      <entry colname="2">CGi request arguments</entry>
-                      <entry colname="3">request_args</entry>
-                      <entry colname="4">varchar(255)</entry>
-                      <entry colname="5">user=Smith&amp;cart=1231&amp;item=532</entry>
-                    </row>
-                    <row>
-                      <entry colname="1">b</entry>
-                      <entry colname="2">Bytes transfered</entry>
-                      <entry colname="3">bytes_sent</entry>
-                      <entry colname="4">int unsigned</entry>
-                      <entry colname="5">32561</entry>
-                    </row>
-                    <row>
-                      <entry colname="1">c<xref linkend="Foot.LogCookie" xreflabel="[1]"/></entry>
-                      <entry colname="2">Text of cookie</entry>
-                      <entry colname="3">cookie</entry>
-                      <entry colname="4">varchar(255)</entry>
-                      <entry colname="5">Apache=sdyn.fooonline.net 1300102700823</entry>
-                    </row>
-                    <row>
-                      <entry>f</entry>
-                      <entry>Local filename requested</entry>
-                      <entry>request_file</entry>
-                      <entry>varchar(255)</entry>
-                      <entry>/var/www/html/books-cycroad.html</entry>
-                    </row>
-                    <row>
-                      <entry>H</entry>
-                      <entry>HTTP request_protocol</entry>
-                      <entry>request_protocol</entry>
-                      <entry>varchar(10)</entry>
-                      <entry>HTTP/1.1</entry>
-                    </row>
-                    <row>
-                      <entry>h</entry>
-                      <entry>Name of remote host</entry>
-                      <entry>remote_host</entry>
-                      <entry>varchar(50)</entry>
-                      <entry>blah.foobar.com</entry>
-                    </row>
-                    <row>
-                      <entry>I</entry>
-                      <entry>Request ID (from modd_unique_id)</entry>
-                      <entry>id</entry>
-                      <entry>char(19)</entry>
-                      <entry>POlFcUBRH30AAALdBG8</entry>
-                    </row>
-                    <row>
-                      <entry>l</entry>
-                      <entry>Ident user info</entry>
-                      <entry>remote_logname</entry>
-                      <entry>varcgar(50)</entry>
-                      <entry>bobby</entry>
-                    </row>
-                    <row>
-                      <entry>M</entry>
-                      <entry>Machine ID<xref linkend="Foot.MachineID" xreflabel="[2]"/></entry>
-                      <entry>machine_id</entry>
-                      <entry>varchar(25)</entry>
-                      <entry>web01</entry>
-                    </row>
-                    <row>
-                      <entry>m</entry>
-                      <entry>HTTP request method</entry>
-                      <entry>request_method</entry>
-                      <entry>varchar(10)</entry>
-                      <entry>GET</entry>
-                    </row>
-                    <row>
-                      <entry>P</entry>
-                      <entry>httpd cchild PID</entry>
-                      <entry>child_pid</entry>
-                      <entry>smallint unsigned</entry>
-                      <entry>3215</entry>
-                    </row>
-                    <row>
-                      <entry>p</entry>
-                      <entry>http port</entry>
-                      <entry>server_port</entry>
-                      <entry>smallint unsigned</entry>
-                      <entry>80</entry>
-                    </row>
-                    <row>
-                      <entry>R</entry>
-                      <entry>Referer</entry>
-                      <entry>referer</entry>
-                      <entry>varchar(255)</entry>
-                      <entry>http://www.biglinks4u.com/linkpage.html</entry>
-                    </row>
-                    <row>
-                      <entry>r</entry>
-                      <entry>Request in full form</entry>
-                      <entry>request_line</entry>
-                      <entry>varchar(255)</entry>
-                      <entry>GET /books-cycroad.html HTTP/1.1</entry>
-                    </row>
-                    <row>
-                      <entry>S</entry>
-                      <entry>Time of request in UNIX time_t format</entry>
-                      <entry>time_stamp</entry>
-                      <entry>int unsigned</entry>
-                      <entry>1005598029</entry>
-                    </row>
-                    <row>
-                      <entry>T</entry>
-                      <entry>Seconds to service request</entry>
-                      <entry>request_duration</entry>
-                      <entry>smallint unsigned</entry>
-                      <entry>2</entry>
-                    </row>
-                    <row>
-                      <entry>t</entry>
-                      <entry>Time of request in human format</entry>
-                      <entry>request_time</entry>
-                      <entry>char(28)</entry>
-                      <entry> [02/Dec/2001:15:01:26 -0800]</entry>
-                    </row>
-                    <row>
-                      <entry>U</entry>
-                      <entry>Request in simple form</entry>
-                      <entry>request_uri</entry>
-                      <entry>varchar(255)</entry>
-                      <entry>/books-cycroad.html</entry>
-                    </row>
-                    <row>
-                      <entry>u</entry>
-                      <entry>User info from HTTP auth</entry>
-                      <entry>remote_user</entry>
-                      <entry>varchar(50)</entry>
-                      <entry>bobby</entry>
-                    </row>
-                    <row>
-                      <entry>v</entry>
-                      <entry>Virtual host servicing the request</entry>
-                      <entry>virtual_host</entry>
-                      <entry>varchar(255)</entry>
-                      <entry>www.foobar.com</entry>
-                    </row>
-                  </tbody>
-                </tgroup>
-              </table>
-              <note id="Foot.LogCookie">
-                <simpara>[1] You must also specify LogSQLWhichCookie for this to take effect.</simpara>
-              </note>
-              <note id="Foot.MachineID">
-                <simpara>[2] You must also specify LogSQLmachineID for this to take effect.</simpara>
-              </note>
-              <table>
-                <title>SSL LogFormat Parameters</title>
-                <tgroup cols="5">
-                  <colspec colname="1" colnum="1"/>
-                  <colspec colname="2" colnum="2"/>
-                  <colspec colname="3" colnum="3"/>
-                  <colspec colname="4" colnum="4"/>
-                  <colspec colname="5" colnum="5"/>
-                  <thead>
-                    <row>
-                      <entry colname="1">Symbol</entry>
-                      <entry colname="2">Meaning</entry>
-                      <entry colname="3">DB Field</entry>
-                      <entry colname="4">Data Type</entry>
-                      <entry colname="5">Example</entry>
-                    </row>
-                  </thead>
-                  <tbody>
-                    <row>
-                      <entry colname="1">z</entry>
-                      <entry colname="2">SSL cipher used</entry>
-                      <entry colname="3">ssl_cipher</entry>
-                      <entry colname="4">varchar(25)</entry>
-                      <entry colname="5">RC4-MD5</entry>
-                    </row>
-                    <row>
-                      <entry colname="1">q</entry>
-                      <entry colname="2">Keysize of the SSL connection</entry>
-                      <entry colname="3">ssl_keysize</entry>
-                      <entry colname="4">smallint unsigned</entry>
-                      <entry colname="5">56</entry>
-                    </row>
-                    <row>
-                      <entry colname="1">Q</entry>
-                      <entry colname="2">maximum keysize supported</entry>
-                      <entry colname="3">ssl_maxkeysize</entry>
-                      <entry colname="4">smallint unsigned</entry>
-                      <entry colname="5">128</entry>
-                    </row>
-                  </tbody>
-                </tgroup>
-              </table>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLRemhostIgnore</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLRemhostIgnore</command>
-                <arg choice="req" rep="repeat"><replaceable>hostname</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLRemhostIgnore localnet.com</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Lists a series of strings that, if present in the REMOTE_HOST, will cause that request to <emphasis>not</emphasis> be logged. This directive is useful for cutting down on log clutter when you are certain that you want to ignore requests from certain hosts, such as your own internal network machines. See section <xref endterm="Sect.Ignore.title" linkend="Sect.Ignore"/> for some tips for using this directive.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <para>Each string is separated by a space, and no regular expressions or globbing are allowed. Each string is evaluated as a substring of the REMOTE_HOST using strstr(). The comparison is case sensitive.</para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLRequestAccept</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLRequestAccept</command>
-                <arg choice="req" rep="repeat"><replaceable>hostname</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLRequestAccept .html .php .jpg</simpara>
-              <simpara>Default: if not specified, all requests are 'accepted'</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Lists a series of strings that, if present in the URI, will permit that request to be considered for logging (depending on additional filtering by the "ignore" directives). Any request that fails to match one of the LogSQLRequestAccept entries will be discarded.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <para>This directive is useful for cutting down on log clutter when you are certain that you only want to log certain kinds of requests, and just blanket-ignore everything else. See section <xref endterm="Sect.Ignore.title" linkend="Sect.Ignore"/> for some tips for using this directive.</para>
-              <para>Each string is separated by a space, and no regular expressions or globbing are allowed. Each string is evaluated as a substring of the URI using strstr(). The comparison is case sensitive.</para>
-              <para>This directive is completely optional. It is more general than LogSQLRequestIgnore and is evaluated before LogSQLRequestIgnore . If this directive is not used, <emphasis>all</emphasis> requests are accepted and passed on to the other filtering directives. Therefore, only use this directive if you have a specific reason to do so.</para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLRequestIgnore</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLRequestIgnore</command>
-                <arg choice="req" rep="repeat"><replaceable>hostname</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLRequestIgnore root.exe cmd.exe default.ida favicon.ico</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Lists a series of strings that, if present in the URI, will cause that request to <emphasis>NOT</emphasis> be logged. This directive is useful for cutting down on log clutter when you are certain that you want to ignore requests for certain objects. See section <xref endterm="Sect.Ignore.title" linkend="Sect.Ignore"/> for some tips for using this directive.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <para>Each string is separated by a space, and no regular expressions or globbing are allowed. Each string is evaluated as a substring of the URI using strstr(). The comparison is case sensitive.</para>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLWhichCookie</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLWhichCookie</command>
-                <arg choice="req" rep="norepeat"><replaceable>cookiename</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example; LogSQLWhichCookie Clicks</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>In HTTP, cookies have names to distinguish them from each other. Using mod_usertrack, for example, you can give your user-tracking cookies a name with the CookieName directive.</para>
-              <para>mod_log_sql allows you to log cookie information. LogSQL_WhichCookie tells mod_log_sql which cookie to log. This is necessary because you will usually be setting and receiving more than one cookie from a client.</para>
-              <note>
-                <para>You must include a 'c' character in LogSQLTransferLogFormat for this directive to take effect.</para>
-                <para>although this was origintally intended for people using mod_usertrack to create user-tracking cookies, you are not restricted in any way. You can choose which cookie you wish to log to the database - any cookie at all - and it does not necessarily have to have anything to do with mod_usertrack.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLWhichCookies</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLWhichCookies</command>
-                <arg choice="req" rep="repeat"><replaceable>cookie-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: logSQLWhichCookies userlogin cookie1 cookie2</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines the list of cookies you would like logged. This works in conjunction with LogSQLCookieLogTable. This directive does <emphasis>not</emphasis> require any additional characters to be added to the LogSQLTransferLogFormat string. The feature is activated simply by including this directive, upon which you will begin populating the separate cookie table with data.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <note>
-                <para>The table must be created (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to 'On'.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLWhichHeadersIn</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLWhichHeadersIn</command>
-                <arg choice="req" rep="repeat"><replaceable>header-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLWhichHeadersIn UserAgent Accept-Encodeing Host</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines the list of inbound headers you would like logged. This works in conjunction with LogSQLHeadersInLogTable. This directive does not require any additional characters to be added to the LogSQLTransferLogFormat string. The feature is activated simply by including this directive, upon which you will begin populating the separate inbound-headers table with data.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <note>
-                <para>The table must be created (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to 'On'.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLWhichHeadersOut</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLWhichHeadersOut</command>
-                <arg choice="req" rep="repeat"><replaceable>header-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLWhichHeadersOut Expires Content-Type Cache-Control</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines the list of outbound headers you would like logged. This works in conjunction with LogSQLHeadersOutLogTable. This directive does not require any additional characters to be added to the LogSQLTransferLogFormat string. The feature is activated simply by including this directive, upon which you will begin populating the separate outbound-headers table with data.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <note>
-                <para>The table must be created (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to 'On'.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLWhichNotes</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLWhichNotes</command>
-                <arg choice="req" rep="repeat"><replaceable>note-name</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLWhichNotes mod_gzip_result mod_gzip_ompression_ratio</simpara>
-              <simpara>Context: virtual host</simpara>
-              <para>Defines the list of notes you would like logged. This works in conjunction with LogSQLNotesLogTable. This directive does not require any additional characters to be added to the LogSQLTransferLogFormat string. The feature is activated simply by including this directive, upon which you will begin populating the separate notes table with data.</para>
-              <para>Each string may contain a + or - prefix in a &lt;VirtualHost&gt; context and will cause those strings to be added (+) or removed (-) from the global configuration. Otherwise the global is completely ignored and overridden if defined in a &lt;VirtualHost&gt;</para>
-              <note>
-                <para>The table must be created (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to 'On'.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </sect3>
-      <sect3>
-        <title>Deprecated Command</title>
-        <variablelist>
-          <varlistentry>
-            <term>LogSQLSocketFile [Deprecated]</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLSocketFile</command>
-                <arg choice="req" rep="norepeat"><replaceable>filename</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLSocketFile /tmp/mysql.sock</simpara>
-              <simpara>Default: (database specific)</simpara>
-              <simpara>Default (MySQL): /var/lib/mysql/mysql.sock</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>At Apache runtime you can specify the MySQL socket file to use. Set this once in your main server config to override the default value. This value is irrelevant if your database resides on a separate machine.</para>
-              <para>mod_log_sql will automatically employ the socket for db communications if the database resides on the local host. If the db resides on a separate host the module will automatically use TCP/IP. This is a function of the MySQL API and is not user-configurable.</para>
-              <note>
-                <para>This directive is deprecated in favor of LogSQLDBParam socketfile [socketfilename]</para>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLTCPPort [Deprecated]</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLTCPPort</command>
-                <arg choice="req" rep="norepeat"><replaceable>port-number</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLTCPPort 3309</simpara>
-              <simpara>Default: (database specific)</simpara>
-              <simpara>Default (MySQL): 3306</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>Your database may listen on a different port than the default. If so, use this directive to instruct the module which port to use. This directive only applies if the database is on a different machine connected via TCP/IP.</para>
-              <note>
-                <para>This directive is deprecated in favor of LogSQLDBParam tcpport [port-number]</para>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-          <varlistentry>
-            <term>LogSQLDatabase [Deprecated]</term>
-            <listitem>
-              <cmdsynopsis sepchar=" ">
-                <command moreinfo="none">LogSQLDatabase</command>
-                <arg choice="req" rep="norepeat"><replaceable>database</replaceable></arg>
-              </cmdsynopsis>
-              <simpara>Example: LogSQLDatabase loggingdb</simpara>
-              <simpara>Context: main server config</simpara>
-              <para>Defines the database that is used for logging. "database" must be a valid db on the MySQL host defined in LogSQLLoginInfo</para>
-              <note>
-                <para>This directive is deprecated in favor of the URI form of LogSQLLoginInfo.</para>
-                <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
-              </note>
-            </listitem>
-          </varlistentry>
-        </variablelist>
-      </sect3>
+      <variablelist>
+        <varlistentry>
+          <term>LogSQLCookieLogTable</term>
+          <listitem>
+            <cmdsynopsis sepchar=" ">
+              <command>LogSQLCookieLogTable</command>
+              <arg choice="req" rep="norepeat"><replaceable></replaceable>table-name</arg>
+            </cmdsynopsis>
+            <simpara>Example: LogSQLCookieLogTable cookie_log</simpara>
+            <simpara>Default: cookies</simpara>
+            <simpara>Context: virtual host</simpara>
+            <para>Defines which table is used for logging of cookies. Working in conjunction with LogSQLWhichCookies, you can log many of each request's associated cookies to a separate table. For meaningful data retrieval the cookie table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
+            <note>
+              <para>You must create the table (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to "on".</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLCreateTables</term>
+          <listitem>
+            <cmdsynopsis>
+              <command>LogSQLCreateTables</command>
+              <arg choice="req">flag</arg>
+            </cmdsynopsis>
+            <simpara>Example: LogSQLCreateTables On</simpara>
+            <simpara>Default: Off</simpara>
+            <simpara>Context: main server config</simpara>
+            <para>mod_log_sql has the ability to create its tables on-the-fly. The advantage to this is convenience: you don't have to execute any SQL by hand to prepare the table. This is especially helpful for people with lots of virtual hosts (who should also see the LogSQLMassVirtualHosting directive).</para>
+            <para>There is a slight disadvantage: if you wish to activate this feature, then the userid specified in LogSQLLoginInfo must have CREATE privileges on the database. In an absolutely paranoid, locked-down situation you may only want to grant your mod_log_sql user INSERT privileges on the database; in that situation you are unable to take advantage of LogSQLCreateTables. But most people -- even the very security-conscious -- will find that granting CREATE on the logging database is reasonable.</para>
+            <note>
+              <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLDatabase</term>
+          <listitem>
+            <cmdsynopsis>
+              <command>LogSQLDatabase</command>
+              <arg choice="req"><replaceable>database</replaceable></arg>
+            </cmdsynopsis>
+            <simpara>Example: LogSQLDatabase loggingdb</simpara>
+            <simpara>Context: main server config</simpara>
+            <para>Defines the database that is used for logging. "database" must be a valid db on the MySQL host defined in LogSQLLoginInfo</para>
+            <note>
+              <para>This is defined only once in the <filename>httpd.conf</filename> file.</para>
+              <para>This directive Must be defined for logging to be enabled.</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogForcePreserve</term>
+          <listitem>
+            <cmdsynopsis>
+              <command>LogSQLForcePreserve</command>
+              <arg choice="req">flag</arg>
+            </cmdsynopsis>
+            <simpara>Example: LogForcePreserve On</simpara>
+            <simpara>Default: Off</simpara>
+            <simpara>Context: main server config</simpara>
+            <para>You may need to perform debugging on your database and specifically want mod_log_sql to make no attempts to log to it. This directive instructs the module to send all its log entries directly to the preserve file and to make no database INSERT attempts.</para>
+            <para>This is presumably a directive for temporary use only; it could be dangerous if you set it and forget it, as all your entries will simply pile up in the preserve file.</para>
+            <note>
+              <para>This is defined only once in the <filename>httpd.conf</filename> file.</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLHeadersInLogTable</term>
+          <listitem>
+            <cmdsynopsis>
+              <command>LogSQLHeadersInLogTable</command>
+              <arg choice="req"><replaceable>table-name</replaceable></arg>
+            </cmdsynopsis>
+            <simpara>Example: LogSQLHeadersInLogTable headers</simpara>
+            <simpara>Default: headers_in</simpara>
+            <simpara>Context: virtual host</simpara>
+            <para>Defines which table is used for logging of inbound headers. Working in conjunction with LogSQLWhichHeadersIn, you can log many of each request's associated headers to a separate table. For meaningful data retrieval the headers table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
+            <note>
+              <para>Note that you must create the table (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to "on".</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLHeadersOutLogTable</term>
+          <listitem>
+            <cmdsynopsis sepchar=" ">
+              <command moreinfo="none">LogSQLHeadersOutLogTable</command>
+              <arg choice="req" rep="norepeat"><replaceable>table-name</replaceable></arg>
+            </cmdsynopsis>
+            <simpara>Example: LogSQLHeadersOutLogTable headers</simpara>
+            <simpara>Default: headers_out</simpara>
+            <simpara>Context: virtual host</simpara>
+            <para>Defines which table is used for logging of outbound headers. Working in conjunction with LogSQLWhichHeadersOut, you can log many of each request's associated headers to a separate table. For meaningful data retrieval the headers table is keyed to the access table by the unique request ID supplied by the standard Apache module mod_unique_id.</para>
+            <note>
+              <para>Note that you must create the table (see create-tables.sql, included in the package), or LogSQLCreateTables must be set to "on".</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLLoginInfo</term>
+          <listitem>
+            <cmdsynopsis>
+              <command>LogSQLLoginInfo</command>
+              <arg choice="req"><replaceable>host</replaceable></arg>
+              <arg choice="req"><replaceable>user</replaceable></arg>
+              <arg choice="req"><replaceable>password</replaceable></arg>
+            </cmdsynopsis>
+            <simpara>Example: LogSQLLoginInfo foobar.baz.com logwriter passw0rd</simpara>
+            <simpara>Context: main server config</simpara>
+            <para>Defines the general parameters of the MySQL host to which you will be logging. "host" is the hostname or IP address of the MySQL machine, and is simply "localhost" if the database lives on the same machine as Apache. "user" is the MySQL userid (not a Unix userid!) with INSERT privileges on the table defined in LogSQLTransferLogTable. "password" is that user's password.</para>
+            <note>
+              <para>This is defined only once in the <filename moreinfo="none">httpd.conf</filename> file.</para>
+              <para>This directive Must be defined for logging to be enabled.</para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLMachineID</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLMassVirtualHosting</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLNotesLogTable</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQlPreserveFile</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLRemhostIgnore</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLRequestAccept</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLRequestIgnore</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLSocketFile</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLTCPPort</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>&lt;sub:Frmat&gt;LogSQLTransferLogFormat </term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLTransferLogTable</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLWhichCookie</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLWhichCookies</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLWhichHeadersIn</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLWhichHeadersOut</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+        <varlistentry>
+          <term>LogSQLWhichNotes</term>
+          <listitem>
+            <cmdsynopsis>
+              <command></command>
+              <arg></arg>
+            </cmdsynopsis>
+            <simpara></simpara>
+            <simpara></simpara>
+            <simpara></simpara>
+            <para></para>
+            <para></para>
+            <note>
+              <para><filename></filename></para>
+            </note>
+          </listitem>
+        </varlistentry>
+      </variablelist>
     </sect2>
   </sect1>
   <sect1>
@@ -1278,7 +1013,7 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
     <qandaset>
       <qandadiv>
         <title>General module questions</title>
-        <qandaentry id="FAQ.WhyLogToSQL">
+        <qandaentry>
           <question>
             <para>Why log to an SQL database?</para>
           </question>
@@ -1446,7 +1181,7 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
             <para>Who's using mod_log_sql?</para>
           </question>
           <answer>
-            <para>Good question! It would be great to find out! If you are a production-level mod_log_sql user, please contact eddie at &EmailContact; so that you can be mentioned here.</para>
+            <para>Good question! It would be great to find out! If you are a production-level mod_log_sql user, please contact [(chris@grubbybaby.com)||the maintainer, Chris Powell] so that you can be mentioned here.</para>
           </answer>
         </qandaentry>
         <qandaentry>
@@ -1468,7 +1203,7 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
             <para>Does mod_log_sql work with Apache 2.x?</para>
           </question>
           <answer>
-            <para>Yes. A port of mod_log_sql is available for Apache 2.x as of mod_log_sql 1.90</para>
+            <para>Yes. A port of mod_log_sql is available for Apache 2.x, and is currently available and maintained at <ulink url="http://www.outoforder.cc/projects/apache/">OutOfOrder.CC</ulink></para>
           </answer>
         </qandaentry>
         <qandaentry>
@@ -1496,7 +1231,7 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
             <para>I have discovered a bug. Who can I contact?</para>
           </question>
           <answer>
-            <para>Please contact Edward Rudd at &EmailContact;, or post a message to the mod_log_sql <xref endterm="Sect.MailingLists.title" linkend="Sect.MailingLists"/>. Your comments, suggestions, bugfixes, bug catches, and usage testimonials are always welcome. As free software, mod_log_sql is intended to be a community effort -- any code contributions or other ideas will be fully and openly credited, of course.</para>
+            <para>Please contact [(chris@grubbybaby.com)||the maintainer], or post a message to the mod_log_sql mailing list. Your comments, suggestions, bugfixes, bug catches, and usage testimonials are always welcome. As free software, mod_log_sql is intended to be a community effort -- any code contributions or other ideas will be fully and openly credited, of course.</para>
           </answer>
         </qandaentry>
       </qandadiv>
@@ -1511,9 +1246,9 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
             <para>PHP and mod_log_sql can be configured to happily coexist. The solution is to configure PHP to link against the real MySQL libraries: recompile PHP using --with-mysql=/your/path. Apache will run properly once the modules are all using the same version of the MySQL libraries.</para>
           </answer>
         </qandaentry>
-        <qandaentry id="FAQ.NothingLogged">
+        <qandaentry>
           <question>
-            <para>Apache appears to start up fine, but nothing is getting logged in the database</para>
+            <para>&lt;faq:NothingLogged&gt;Apache appears to start up fine, but nothing is getting logged in the database</para>
           </question>
           <answer>
             <para>If you do not see any entries in the access_log, then something is preventing the inserts from happening. This could be caused by several things:</para>
@@ -1522,17 +1257,17 @@ where a.id=n.id and a.id='PPIDskBRH30AAGPtAsg';</screen>
                 <simpara>Improper privileges set up in the MySQL database </simpara>
               </listitem>
               <listitem>
-                <simpara>You are not hitting a VirtualHost that has a LogSQLTransferLogTable entry </simpara>
+                <simpara>You aren't hitting a VirtualHost that has a LogSQLTransferLogTable entry </simpara>
               </listitem>
               <listitem>
-                <simpara>You did not specify the right database host or login information</simpara>
+                <simpara>You didn't specify the right database host or login information</simpara>
               </listitem>
               <listitem>
                 <simpara>Another factor is preventing a connection to the database</simpara>
               </listitem>
             </itemizedlist>
             <remark>It is improper to ask for help before you have followed these steps.</remark>
-            <para>First examine the MySQL log that you established in step <xref linkend="Item.EnableLogging"/> of section <xref endterm="Sect.Preperation.title" linkend="Sect.Preperation"/>. Ensure that the INSERT statements are not being rejected because of a malformed table name or other typographical error. By enabling that log, you instructed MySQL to log every connection and command it receives -- if you see no INSERT attempts in the log, the module isn't successfully connecting to the database. If you see nothing at all in the log -- not even a record of your administrative connection attempts, then you did not enable the log correctly. If you do see INSERT attempts but they are failing, the log should tell you why.</para>
+            <para>First examine the MySQL log that you established in step [step:EnaLog] of section [sub:PrepDb]. Ensure that the INSERT statements are not being rejected because of a malformed table name or other typographical error. By enabling that log, you instructed MySQL to log every connection and command it receives -- if you see no INSERT attempts in the log, the module isn't successfully connecting to the database. If you see nothing at all in the log -- not even a record of your administrative connection attempts, then you did not enable the log correctly. If you do see INSERT attempts but they are failing, the log should tell you why.</para>
             <para>Second, confirm that your LogSQL* directives are all correct.</para>
             <para>Third, examine the Apache error logs for messages from mod_log_sql; the module will offer hints as to why it cannot connect, etc. </para>
             <para>The next thing to do is to change the LogLevel directive <emphasis>in the main server config as well as in each VirtualHost config:</emphasis></para>
@@ -1545,7 +1280,7 @@ ErrorLog /var/log/httpd/server-messages </programlisting>
             <para>Why do I get the message "insufficient configuration info to establish database link" in my Apache error log?</para>
           </question>
           <answer>
-            <para>At a minimum, LogSQLLoginInfo in the URl form and either LogSQLTableName or LogSQLMassVirtualHosting must be defined in order for the module to be able to establish a database link. If these are not defined or are incomplete you will receive this error message.</para>
+            <para>At a minimum, LogSQLDatabase and LogSQLLoginInfo and either LogSQLTableName or LogSQLMassVirtualHosting must be defined in order for the module to be able to establish a database link. If these are not defined or are incomplete you will receive this error message.</para>
           </answer>
         </qandaentry>
         <qandaentry>
@@ -1553,7 +1288,7 @@ ErrorLog /var/log/httpd/server-messages </programlisting>
             <para>My database cannot handle all the open connections from mod_log_sql, is there anything I can do?</para>
           </question>
           <answer>
-            <para>The rule of thumb: if you have n webservers each configured to support y MaxClients, then your database must be able to handle n times y simultaneous connections in the worst case. Certainly you must use common sense, consider reasonable traffic expectations and structure things accordingly.</para>
+            <para>The rule of thumb: if you have n webservers each configured to support y MaxClients, then your database must be able to handle n\times y simultenous connections in the worst case. Certainly you must use common sense, consider reasonable traffic expectations and structure things accordingly.</para>
           </answer>
           <answer>
             <para>Tweaking my.cnf to scale to high connection loads is imperative. But if hardware limitations prevent your MySQL server from gracefully handling the number of incoming connections, it would be beneficial to upgrade the memory or CPU on that server in order to handle the load. </para>
@@ -1562,7 +1297,7 @@ ErrorLog /var/log/httpd/server-messages </programlisting>
             <para>Jeremy Zawodny, a highly respected MySQL user and contributor to Linux Magazine, has this very helpful and highly appropriate article on tuning MySQL: <ulink url="http://jeremy.zawodny.com/blog/archives/000173.html">MySQL, Linux, and Thread Caching</ulink></para>
           </answer>
           <answer>
-            <para><abbrev></abbrev>Please remember that mod_log_sql's overriding principle is performance -- that is what the target audience demands and expects. Other database logging solutions do not open and maintain many database connections, but their performance suffers drastically. For example, pgLOGd funnels all log connections through a separate daemon that connects to the database, but that bottlenecks the entire process. mod_log_sql achieves performance numbers an order of magnitude greater than the alternatives because it dispenses with the overhead associated with rapid connection cycling, and it does not attempt to shoehorn all the database traffic through a single extra daemon or proxy process.</para>
+            <para><abbrev></abbrev>Please remember that mod_log_sql's overriding principle is performance -- that is what the target audience demands and expects. Other database logging solutions do not open and maintain many database connections, but their performance suffers drastically. For example, pgLOGd funnels all log connections through a separate daemon that connects to the database, but that bottlenecks the entire process. mod_log_sql achieves performance numbers an order of magnitude greater than the alternatives because it dispenses with the overhead associated with rapid connection cycling, and it doesn't attempt to shoehorn all the database traffic through a single extra daemon or proxy process.</para>
           </answer>
           <answer>
             <remark>Currently connection pooling is being implemented as part of the Database Abstraction layer to allow multiple httpd processes to share connections.</remark>
@@ -1573,7 +1308,7 @@ ErrorLog /var/log/httpd/server-messages </programlisting>
             <para>Why do I occasionally see a "lost connection to MySQL server" message in my Apache error log?</para>
           </question>
           <answer>
-            <para>This message may appear every now and then in your Apache error log, especially on very lightly loaded servers. This does not mean that anything is necessarily wrong. Within each httpd child process, mod_log_sql will open (and keep open) a connection to the MySQL server. MySQL, however, will close connections that have not been used in a while; the default timeout is 8 hours. When this occurs, mod_log_sql will notice and re-open the connection. That event is what is being logged, and looks like this:</para>
+            <para>This message may appear every now and then in your Apache error log, especially on very lightly loaded servers. This doesn't mean that anything is necessarily wrong. Within each httpd child process, mod_log_sql will open (and keep open) a connection to the MySQL server. MySQL, however, will close connections that haven't been used in a while; the default timeout is 8 hours. When this occurs, mod_log_sql will notice and re-open the connection. That event is what is being logged, and looks like this:</para>
             <screen>[Tue Nov 12 19:04:10 2002] [error] mod_log_sql: first attempt failed, 
   API said: error 2013, Lost connection to MySQL server during query 
 [Tue Nov 12 19:04:10 2002] [error] mod_log_sql: reconnect successful
@@ -1685,9 +1420,9 @@ mysql&gt; optimize table access_log; </screen>
             <para>If you have exhausted all the tuning possibilities on your existing server, it is probably time you evaluated the benefits of clustering two or more webservers together in a load-balanced fashion. In fact, users of such a setup are mod_log_sql's target audience!</para>
           </answer>
         </qandaentry>
-        <qandaentry id="FAQ.DelayedInsert">
+        <qandaentry>
           <question>
-            <para>What is the issue with activating delayed inserts?</para>
+            <para>&lt;sub:DelayedInsFAQ&gt;What is the issue with activating delayed inserts?</para>
           </question>
           <answer>
             <para>INSERT DELAYED is a specific syntax to MySQL and is not supported by any other database. Ergo, why is it needed, and what MySQL deficiency is it working around? INSERT DELAYED is a kluge.</para>
@@ -1705,7 +1440,7 @@ mysql&gt; optimize table access_log; </screen>
             <para>Instead of delayed inserts, you may wish to utilize InnoDB tables (instead of the standard MyISAM tables). InnoDB tables suppot row-level locking and are recommended for high-volume databases.</para>
           </answer>
           <answer>
-            <para>If after understanding these problems you still wish to enable delayed inserts, section <xref endterm="Sect.DelayedInsert.title" linkend="Sect.DelayedInsert"/> discusses how.</para>
+            <para>If after understanding these problems you still wish to enable delayed inserts, section [sub:DelayedIns] discusses how.</para>
           </answer>
         </qandaentry>
       </qandadiv>
@@ -1730,9 +1465,9 @@ rm -f /var/log/httpd/templog</programlisting>
             <para>See? Easy.</para>
           </answer>
         </qandaentry>
-        <qandaentry id="FAQ.Cookie">
+        <qandaentry>
           <question>
-            <para>How can I log mod_usertrack cookies?</para>
+            <para>&lt;sec:cookie&gt;How can I log mod_usertrack cookies?</para>
           </question>
           <answer>
             <para>A number of people like to log mod_usertrack cookies in their Apache TransferLog to aid in understanding their visitors' clickstreams. This is accomplished, for example, with a statement as follows:</para>
@@ -1788,8 +1523,8 @@ rm -f /var/log/httpd/templog</programlisting>
           </question>
           <answer>
             <para>As of version 1.17, you have a choice in how you want cookie logging handled.</para>
-            <para>If you are interested in logging only one cookie per request, follow the instructions in FAQ entry <xref linkend="FAQ.Cookie"/> above. That cookie will be logged to a column in the regular access_log table, and the actual cookie you want to log is specified with LogSQLWhichCookie. Don't forget to specify the 'c' character in LogSQLTransferLogFormat.</para>
-            <para>If, however, you need to log multiple cookies per request, you must employ the LogSQLWhichCookies (note the plural) directive. The cookies you specify will be logged to a separate table (as discussed in section <xref endterm="Sect.MultiTable.title" linkend="Sect.MultiTable"/>), and entries in that table will be linked to the regular access_log entries via the unique ID that is supplied by mod_unique_id. Without mod_unique_id the information will still be logged but you will be unable to correlate which cookies go with which access-requests. Furthermore, with LogSQLWhichCookies, you do not need to include the 'c' character in LogSQLTransferLogFormat.</para>
+            <para>If you are interested in logging only one cookie per request, follow the instructions in section [sec:cookie] above. That cookie will be logged to a column in the regular access_log table, and the actual cookie you want to log is specified with LogSQLWhichCookie. Don't forget to specify the 'c' character in LogSQLTransferLogFormat.</para>
+            <para>If, however, you need to log multiple cookies per request, you must employ the LogSQLWhichCookies (note the plural) directive. The cookies you specify will be logged to a separate table (as discussed in section [secMulTable]), and entries in that table will be linked to the regular access_log entries via the unique ID that is supplied by mod_unique_id. Without mod_unique_id the information will still be logged but you will be unable to correlate which cookies go with which access-requests. Furthermore, with LogSQLWhichCookies, you do not need to include the 'c' character in LogSQLTransferLogFormat.</para>
             <para>LogSQLWhichCookie and LogSQLWhichCookies can coexist without conflict because they operate on entireley different tables, but you're better off choosing the one you need.</para>
           </answer>
         </qandaentry>
@@ -1812,7 +1547,7 @@ mysql&gt; alter table access_log add column ssl_maxkeysize smallint unsigned;</s
  LogSQLTransferLogFormat AbHhmRSsTUuvcQqz 
 &lt;/VirtualHost&gt;</programlisting>
             <para>You also need to make sure you have the mod_log_sql_ssl module loaded as well.</para>
-            <para>The last three characters (Qqz) in the directive are the SSL ones; see section <xref linkend="Conf.LogSQLTransferLogFormat"/> in the directives documentation for details of the LogSQLTransferLogFormat directive.</para>
+            <para>The last three characters (Qqz) in the directive are the SSL ones; see section [sub:Frmat] in the directives documentation for details of the LogSQLTransferLogFormat directive.</para>
             <para>Restart Apache, then perform some hits on your server. Then run the following select statement:</para>
             <screen>mysql&gt; select remote_host,request_uri,ssl_cipher,ssl_keysize,ssl_maxkeysize from access_log where ssl_cipher is not null;</screen>
             <table>
diff --git a/INSTALL b/INSTALL
index 072f738..3cc8a94 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,20 +1,5 @@
+$Id: INSTALL,v 1.1 2003/12/20 07:16:05 urkle Exp $
+
 This document has been superseded by the new documentation in the
-docs/ directory.  There you will find the docs in a variety of
+Documentation/ directory.  There you will find the docs in a variety of
 formats, including PostScript, plaintext, and HTML.
-
-Basic overview is..
-
-./configure --with-apxs=/path/to/apxs --enable-ssl
-
-gmake
-
-gmake install
-
-
-edit httpd.conf and add the following.
-
-LoadModule log_sql_module modules/mod_log_sql.so
-LoadModule log_sql_mysql_module modules/mod_log_sql_mysql.so
-<IfModule mod_ssl.c>
-LoadModule log_sql_ssl_module modules/mod_log_sql_ssl.so
-</IfModule>
diff --git a/LICENSE b/LICENSE
index 4c98781..b6090e0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
+$Id: LICENSE,v 1.1 2003/12/20 07:16:05 urkle Exp $
 
-Copyright (c) 2004 Edward M. Rudd. All rights reserved.
 Copyright (c) 2002 Christopher B. Powell. All rights reserved.
 Portions copyright (c) 2000 The Apache Software Foundation.  
 
@@ -117,3 +117,5 @@ WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
 The End
+ 
+ 
diff --git a/Makefile.in b/Makefile.in
index 07278d3..bc3d2d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,9 @@
 # @configure_input@
 
 # Modify these top variables.
-SUBDIRS = docs contrib
-SOURCES = @PACKAGE_NAME@.c
+SUBDIRS = Documentation
+SOURCES = \
+        @PACKAGE_NAME@.c
 
 HEADERS = mod_log_sql.h \
                 functions.h \
@@ -13,52 +14,22 @@ HEADERS = mod_log_sql.h \
 
 CFLAGS = -Wc,-Wall -Wc,-Werror -Wc,-fno-strict-aliasing
 
-LDADD = @RT_LIBS@
+INCLUDES = @MYSQL_CFLAGS@
 
-EXTRA_DIST = AUTHORS INSTALL TODO LICENSE CHANGELOG
+LDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
+
+EXTRA_DIST = AUTHORS INSTALL LICENSE CHANGELOG make_combined_log.pl
 
 TARGET = @PACKAGE_NAME@@APXS_EXTENSION@
 
-TARGETS = $(TARGET)
+sslSOURCES = mod_log_sql_ssl.c
 
-sslSOURCES = @PACKAGE_NAME@_ssl.c
 sslTARGET = @PACKAGE_NAME@_ssl@APXS_EXTENSION@
-sslLDADD = 
-sslCFLAGS = @MOD_SSL_CFLAGS@ 
-sslNAME = log_sql_ssl
 
 ifeq (@WANT_SSL_MOD@,1)
-TARGETS += $(sslTARGET)
-endif
-
-mysqlSOURCES = @PACKAGE_NAME@_mysql.c
-mysqlTARGET = @PACKAGE_NAME@_mysql@APXS_EXTENSION@
-mysqlLDADD = @MYSQL_LDFLAGS@ @MYSQL_LIBS@
-mysqlCFLAGS = @MYSQL_CFLAGS@
-mysqlNAME = log_sql_mysql
-
-ifeq (@WANT_MYSQL_MOD@,1)
-TARGETS += $(mysqlTARGET)
-endif
-
-pgsqlSOURCES = @PACKAGE_NAME@_pgsql.c
-pgsqlTARGET = @PACKAGE_NAME@_pgsql@APXS_EXTENSION@
-pgsqlLDADD = @PGSQL_LDFLAGS@ @PGSQL_LIBS@
-pgsqlCFLAGS = @PGSQL_CFLAGS@
-pgsqlNAME = log_sql_pgsql
-
-ifeq (@WANT_PGSQL_MOD@,1)
-TARGETS += $(pgsqlTARGET)
-endif
-
-dbiSOURCES = @PACKAGE_NAME@_dbi.c
-dbiTARGET = @PACKAGE_NAME@_dbi@APXS_EXTENSION@
-dbiLDADD = @DBI_LDFLAGS@ @DBI_LIBS@
-dbiCFLAGS = @DBI_CFLAGS@
-dbiNAME = log_sql_dbi
-
-ifeq (@WANT_DBI_MOD@,1)
-TARGETS += $(dbiTARGET)
+TARGETS = $(TARGET) $(sslTARGET)
+else
+TARGETS = $(TARGET)
 endif
 
 #Don't modify anything below here
@@ -68,11 +39,11 @@ PROVIDERS_SUBDIRS = @subdirs@
 srcdir = @abs_srcdir@
 builddir = @abs_builddir@
 
-OBJ = $(SOURCES:.c=.o) $(sslSOURCES:.c=.o) $(mysqlSOURCES:.c=.o)
+OBJ = $(SOURCES:.c=.o) $(sslSOURCES:.c=.o)
 
-LO = $(SOURCES:.c=.lo) $(sslSOURCES:.c=.lo) $(mysqlSOURCES:.c=.lo)
+LO = $(SOURCES:.c=.lo) $(sslSOURCES:.c=.lo)
 
-SLO = $(SOURCES:.c=.slo) $(sslSOURCES:.c=.slo) $(mysqlSOURCES:.c=.slo)
+SLO = $(SOURCES:.c=.slo) $(sslSOURCES:.c=.slo)
 
 STD_DIST = install-sh \
         config.sub \
@@ -84,8 +55,7 @@ STD_DIST = install-sh \
         stamp-h.in \
         config.h.in
 
-DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(HEADERS) \
-    $(sslSOURCES) $(mysqlSOURCES)
+DISTFILES = $(STD_DIST) $(EXTRA_DIST) $(SOURCES) $(sslSOURCES) $(HEADERS)
 
 all: $(TARGETS) all-subdirs
 
@@ -104,49 +74,23 @@ all-subdirs install-subdirs activate-subdirs clean-subdirs distclean-subdirs:
                 fi; \
         done;
 
-TODO: TODO.in
-        @./gen_todo.pl
-
 $(TARGET): $(SOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(TARGET) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(LDADD) $(SOURCES)
+        @@APXS_BIN@ -c -o $(TARGET) $(INCLUDES) $(CFLAGS) \
+                $(LDADD) @DEFS@ @APACHE_DEFS@ $(SOURCES)
 
 $(sslTARGET): $(sslSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(sslTARGET) $(sslCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(sslLDADD) $(sslSOURCES)
+        @@APXS_BIN@ -c -o $(sslTARGET) $(INCLUDES) @MOD_SSL_CFLAGS@ $(CFLAGS) \
+                @DEFS@ @APACHE_DEFS@ $(sslSOURCES)
 
-$(mysqlTARGET): $(mysqlSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(mysqlTARGET) $(mysqlCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(mysqlLDADD) $(mysqlSOURCES)
-
-$(pgsqlTARGET): $(pgsqlSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(pgsqlTARGET) $(pgsqlCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(pgsqlLDADD) $(pgsqlSOURCES)
-
-$(dbiTARGET): $(dbiSOURCES) $(HEADERS)
-        @@APXS_BIN@ -c -o $(dbiTARGET) $(dbiCFLAGS) $(CFLAGS) \
-                @DEFS@ @AP_DEFS@ $(dbiLDADD) $(dbiSOURCES)
+include:
+        rm -rf include
+        ln -s @APACHE_INCDIR@ include
 
 install: $(TARGETS) install-subdirs
         @@APXS_BIN@ -i $(TARGET); \
-        @APXS_BIN@ -n $(mysqlNAME) -i $(mysqlTARGET); \
         if test @WANT_SSL_MOD@ -eq 1; then \
-                @APXS_BIN@ -n $(sslNAME) -i $(sslTARGET); \
-        fi; \
-        echo "*************************************************************************"; \
-        echo "*** The mod_log_sql modules have been installed."; \
-        echo "*** Please edit your Apache configuration files and"; \
-        echo "*** add the appropriate LoadModule directives per the documentation"; \
-        echo "*** in docs/manual.html"; \
-        echo "*** If you have previously used 1.18 or lower then you must change"; \
-        echo "*** >LoadModule sql_log_module modules/mod_log_sql.so"; \
-        echo "***   to"; \
-        echo "*** >LoadModule log_sql_module modules/mod_log_sql.so"; \
-        echo "*** in your httpd.conf as the internal name of the module has changed."; \
-        echo "*** "; \
-        echo "*** Also read the documentation about using SSL support and new "; \
-        echo "*** configuration directives."; \
-        echo "*************************************************************************";
+                @APXS_BIN@ -i $(sslTARGET); \
+        fi
 
 activate: activate-subdirs
         @@APXS_BIN@ -i -a $(TARGET); \
diff --git a/TODO.in b/TODO.in
deleted file mode 100644
index 12bb30c..0000000
--- a/TODO.in
+++ /dev/null
@@ -1,16 +0,0 @@
-TODO:
-* write alternate DB driver (PostgreSQL, libDBI, mod_*_pool)
-* look at forcing table name to ServerName instead of on of the names in 
-  ServerAlias?
-* LogSQLRotateLogs directive with daily/monthly/weekly/etc.
-* socket-based middleman daemon with configurable conns, or connect/disconnect.
-* DBI connection pool when I switch to DBI.
-* ignore by cookie
-* investigate thread safety issues 
-        Use libmysqlclient_r for threaded MPM (or always?)
-        Add thread locks if using standard mysqlclient 
-        Check locking issues with the preserve file?
-* rewrite main core logging function to optimize for speed.
-* Clean up table creation code.
-        support DB independent way of defining the tables
------
diff --git a/apache13.h b/apache13.h
index ce4ec64..8181c43 100644
--- a/apache13.h
+++ b/apache13.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/apache13.h,v 1.4 2004/02/05 21:59:46 urkle Exp $ */
 #ifndef APACHE13_H
 #define APACHE13_H
 
@@ -8,27 +8,25 @@
 #include "http_core.h"
 
 /* Defines */
-#define AP_MODULE_DECLARE_DATA MODULE_VAR_EXPORT
+#define AP_MODULE_DECLARE_DATA
 #define APR_OFF_T_FMT "ld"
 #define APR_PID_T_FMT "d"
 #define APR_SUCCESS 0
 #define APR_OFFSETOF XtOffsetOf
 
-/** method of declaring a directive with raw argument parsing */
-# define AP_INIT_RAW_ARGS(directive, func, mconfig, where, help) \
-    { directive, func, mconfig, where, RAW_ARGS, help }
+/*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")
+
+{"LogSQLTransferLogTable", set_log_sql_transfer_table,                  NULL,   RSRC_CONF,      TAKE1,
+         "The database table that holds the transfer log"}*/
+
 /** method of declaring a directive which takes 1 argument */
 # define AP_INIT_TAKE1(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, TAKE1, help }
-/** method of declaring a directive which takes 2 argument */
-# define AP_INIT_TAKE2(directive, func, mconfig, where, help) \
-    { directive, func, mconfig, where, TAKE2, help }
 /** method of declaring a directive which takes multiple arguments */
 # define AP_INIT_ITERATE(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, ITERATE, help }
-/** method of declaring a directive which takes 1 or 3 arguments */
-# define AP_INIT_TAKE13(directive, func, mconfig, where, help) \
-    { directive, func, mconfig, where, TAKE13, help }
 /** method of declaring a directive which takes 3 arguments */
 # define AP_INIT_TAKE3(directive, func, mconfig, where, help) \
     { directive, func, mconfig, where, TAKE3, help }
@@ -39,35 +37,21 @@
 /* Types */
 #define apr_pool_t pool
 #define apr_array_header_t array_header
-#define apr_table_t table
-
-#define apr_status_t int
-#define apr_uri_t uri_components
 
 /* Functions */
 #define ap_get_remote_host(a,b,c,d) ap_get_remote_host(a,b,c)
-#define ap_set_deprecated NULL
-        
+
 #define apr_uri_unparse ap_unparse_uri_components
-#define apr_uri_parse ap_parse_uri_components
-#define ap_add_version_component(p,s) ap_add_version_component(s)
 
 #define apr_pool_create(a,b) *(a) = ap_make_sub_pool(b)
-#define apr_pool_destroy ap_destroy_pool
 #define apr_palloc ap_palloc
 #define apr_pcalloc ap_pcalloc
 #define apr_pstrdup ap_pstrdup
 #define apr_pstrcat ap_pstrcat
 #define apr_psprintf ap_psprintf
 #define apr_snprintf ap_snprintf
-#define ap_strchr strchr
-#define ap_strchr_c strchr
-#define ap_strstr strstr
-#define ap_strstr_c strstr
 
-#define apr_table_set ap_table_set
 #define apr_table_get ap_table_get
-#define apr_table_make ap_make_table
 
 #define apr_array_push ap_push_array
 #define apr_array_make ap_make_array
@@ -76,22 +60,6 @@
 
 #define apr_tolower ap_tolower
 
-void log_error(char *file, int line, int level, apr_status_t status, 
-        const server_rec *s, const char *fmt, ...) __attribute__ ((format (printf, 6,7)));
-        
-#ifndef WIN32
-inline
-#endif
-void log_error(char *file, int line, int level, 
-        apr_status_t status, const server_rec *s, const char *fmt, ...)
-{
-        static char buff[MAX_STRING_LEN];
-        va_list args;
-        va_start(args, fmt);
-        ap_vsnprintf(buff,MAX_STRING_LEN, fmt,args);
-        ap_log_error(file,line,level | APLOG_NOERRNO ,s,"%s",buff);
-        va_end(args);
-}
-
+#define log_error ap_log_error
 
 #endif /* APACHE13_H */
diff --git a/apache20.h b/apache20.h
index 9d87588..1b54858 100644
--- a/apache20.h
+++ b/apache20.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/apache20.h,v 1.3 2004/01/21 04:34:21 urkle Exp $ */
 #ifndef APACHE20_H
 #define APACHE20_H
 
@@ -20,6 +20,15 @@
 
 #include "util_time.h"
 
-#define log_error ap_log_error
+static void log_error(char *file, int line, int level, const server_rec *s, const char *fmt, ...) __attribute__ ((format (printf, 5,6)));
+static inline void log_error(char *file, int line, int level, const server_rec *s, const char *fmt, ...)
+{
+        static char buff[MAX_STRING_LEN];
+        va_list args;
+        va_start(args, fmt);
+        apr_vsnprintf(buff,MAX_STRING_LEN, fmt,args);
+        ap_log_error(file,line,level,0,s,"%s",buff);
+        va_end(args);
+}
 
 #endif /* APACHE20_H */
diff --git a/build-apache13.bat b/build-apache13.bat
deleted file mode 100644
index 77461ee..0000000
--- a/build-apache13.bat
+++ /dev/null
@@ -1,47 +0,0 @@
-@echo off

-cls

-rem path to Microsoft SDK installation

-SET DIR_MSSDK=C:\Program Files\Microsoft SDK

-rem path to apache2 installation

-SET DIR_APACHE=C:\Program Files\Apache Group\Apache

-rem path to mysql 4.0 installation

-SET DIR_MYSQL=C:\MySQL

-rem Can be set to opt or debug

-SET LIB_MYSQL=opt

-

-copy /Y winconfig.h config.h

-mkdir Release

-cd Release

-Rem Compile all the source code

-echo /MD /W3 /Zi /Ze /O2 > RESP_c.txt

-echo /DNDEBUG /D_WINDOWS /DWIN32 >> RESP_c.txt

-echo /Fd"mod_log_sql" /FD >> RESP_c.txt

-echo /DHAVE_CONFIG_H /DWITH_APACHE13 /DLOGSQL_DECLARE_EXPORT >> RESP_c.txt

-echo /DSHARED_MODULE >> RESP_c.txt

-echo /I.. >> RESP_c.txt

-echo /I"%DIR_MSSDK%\Include" >> RESP_c.txt

-echo /I"%DIR_APACHE%\Include" >> RESP_c.txt

-echo /I"%DIR_MYSQL%\Include" >> RESP_c.txt

-cl @RESP_c.txt /c ..\mod_log_sql.c ..\mod_log_sql_mysql.c

-

-rem link main module

-echo /MACHINE:I386 /SUBSYSTEM:windows > RESP_l.txt

-echo /OUT:mod_log_sql.so /DLL /OPT:REF /DEBUG >> RESP_l.txt

-echo /LIBPATH:"%DIR_APACHE%\lib" >> RESP_l.txt

-echo /LIBPATH:"%DIR_APACHE%\libexec" >> RESP_l.txt

-echo /LIBPATH:"%DIR_MSSDK%\lib" >> RESP_l.txt

-echo ApacheCore.lib >> RESP_l.txt

-link @RESP_l.txt mod_log_sql.obj

-

-rem link mysql module

-echo /MACHINE:I386 /SUBSYSTEM:windows > RESP_l.txt

-echo /OUT:mod_log_sql_mysql.so /DLL /OPT:REF /DEBUG >> RESP_l.txt

-echo /LIBPATH:"%DIR_APACHE%\lib" >> RESP_l.txt

-echo /LIBPATH:"%DIR_APACHE%\libexec" >> RESP_l.txt

-echo /LIBPATH:"%DIR_MYSQL%\lib\%LIB_MYSQL%" >> RESP_l.txt

-echo /LIBPATH:"%DIR_MSSDK%\lib" >> RESP_l.txt

-echo /NODEFAULTLIB:LIBCMT.lib >> RESP_l.txt

-echo ApacheCore.lib >> RESP_l.txt

-echo libmysql.lib mod_log_sql.lib >> RESP_l.txt

-link @RESP_l.txt mod_log_sql_mysql.obj

-cd ..

diff --git a/build-apache2.bat b/build-apache2.bat
deleted file mode 100644
index f44109c..0000000
--- a/build-apache2.bat
+++ /dev/null
@@ -1,40 +0,0 @@
-@echo off

-rem path to Microsoft SDK installation

-SET DIR_MSSDK=C:\Program Files\Microsoft SDK

-rem path to apache2 installation

-SET DIR_APACHE=C:\Program Files\Apache Group\Apache2

-rem path to mysql 4.0 installation

-SET DIR_MYSQL=C:\MySQL

-rem Can be set to opt or debug

-SET LIB_MYSQL=opt

-

-copy /Y winconfig.h config.h

-mkdir Release

-cd Release

-Rem Compile all the source code

-echo /MD /W3 /Zi /O2 /DNDEBUG /D_WINDOWS /DWIN32 > RESP_c.txt

-echo /Fd"mod_log_sql" /FD >> RESP_c.txt

-echo /DHAVE_CONFIG_H /DWITH_APACHE20 /DLOGSQL_DECLARE_EXPORT >> RESP_c.txt

-echo /I.. >> RESP_c.txt

-echo /I"%DIR_MSSDK%\Include" >> RESP_c.txt

-echo /I"%DIR_APACHE%\Include" >> RESP_c.txt

-echo /I"%DIR_MYSQL%\Include" >> RESP_c.txt

-cl @RESP_c.txt /c ..\mod_log_sql.c ..\mod_log_sql_mysql.c

-

-rem link main module

-echo /MACHINE:I386 /SUBSYSTEM:windows > RESP_l.txt

-echo /OUT:mod_log_sql.so /DLL /OPT:REF /DEBUG >> RESP_l.txt

-echo /LIBPATH:"%DIR_APACHE%\lib" >> RESP_l.txt

-echo libapr.lib libaprutil.lib libhttpd.lib >> RESP_l.txt

-link @RESP_l.txt mod_log_sql.obj

-

-rem link mysql module

-echo /MACHINE:I386 /SUBSYSTEM:windows > RESP_l.txt

-echo /OUT:mod_log_sql_mysql.so /DLL /OPT:REF /DEBUG >> RESP_l.txt

-echo /LIBPATH:"%DIR_APACHE%\lib" >> RESP_l.txt

-echo /LIBPATH:"%DIR_MYSQL%\lib\%LIB_MYSQL%" >> RESP_l.txt

-echo /NODEFAULTLIB:LIBCMT.lib >> RESP_l.txt

-echo libapr.lib libaprutil.lib libhttpd.lib >> RESP_l.txt

-echo libmysql.lib mod_log_sql.lib >> RESP_l.txt

-link @RESP_l.txt mod_log_sql_mysql.obj

-cd ..

diff --git a/configure.ac b/configure.ac
index 42e2bde..fb036ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,5 @@
 dnl Required initializer
-AC_INIT(mod_log_sql, 1.98)
-OOO_CONFIG_NICE(config.nice)
+AC_INIT(mod_log_sql, 1.95)
 AC_PREREQ(2.53)
 AC_CONFIG_HEADERS(config.h)
 
@@ -9,9 +8,9 @@ AC_CONFIG_SRCDIR(mod_log_sql.c)
 dnl Add a test for a compiler.
 AC_PROG_CC
 
-APACHE20_VERSION=2.0.40
+APACHE20_VERSION=2.0.44
 APACHE13_VERSION=1.3.20
-CHECK_APACHE($APACHE13_VERSION,$APACHE20_VERSION,
+CHECK_PATH_APACHE($APACHE13_VERSION,$APACHE20_VERSION,
                 :,
                 :,
                 AC_MSG_ERROR([*** The correct version Apache was not found!])
@@ -31,43 +30,20 @@ CHECK_PATH_MOD_SSL(
 
 AC_SUBST(WANT_SSL_MOD)
 
-WANT_MYSQL_MOD=1
-AC_SUBST(WANT_MYSQL_MOD)
-WANT_PGSQL_MOD=0
-AC_SUBST(WANT_PGSQL_MOD)
-WANT_DBI_MOD=0
-AC_SUBST(WANT_DBI_MOD)
-
-case "$target" in
-        *-*-solaris* | *-*-osf* )
-                if test $APACHE_VERSION -eq 1.3; then
-                        RT_LIBS=-lrt
-                fi
-                ;;
-        *)
-                RT_LIBS=""
-                ;;
-esac
-
-AC_SUBST(RT_LIBS)
-
-
 AC_CHECK_HEADERS(limits.h)
 
 AC_CONFIG_FILES([stamp-h], [echo timestamp > stamp-h])
 
 dnl Write config.status and the Makefile
 
-AC_OUTPUT(Makefile
-docs/Makefile
-contrib/Makefile)
-
+AC_OUTPUT(Makefile Documentation/Makefile)
 
 AC_MSG_RESULT([------------------------------------])
-AC_MSG_RESULT([Apache version   : $AP_VERSION])
+AC_MSG_RESULT([Apache version   : $APACHE_VERSION])
 if test $WANT_SSL_MOD -eq 1; then
         AC_MSG_RESULT([SSL Support      : yes])
 else
         AC_MSG_RESULT([SSL Support      : no])
         AC_MSG_RESULT([*** Use --enable-ssl to enable SSL support])
+        AC_MSG_RESULT([*** and --with-ssl-inc for the directory for SSL headers])
 fi
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index b384fd0..c40a711 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -3,10 +3,7 @@
 # Modify these top variables.
 SUBDIRS = 
 
-EXTRA_DIST = README \
-                create_tables.sql \
-                make_combined_log.pl \
-                mysql_import_combined_log.pl
+EXTRA_DIST = README mysql_import_combined_log.pl
 
 #Don't modify anything below here
 
diff --git a/contrib/README b/contrib/README
index bf0e65f..7dac946 100644
--- a/contrib/README
+++ b/contrib/README
@@ -1,38 +1 @@
-This directory contains contributed scripts/programs/utilites for mod_log_sql.
-
-* create_tables.sql
-
-This is the create table SQL commands to create the access, headers_in, 
-headers_out, cookies, and notes tables in the MySQL database.
-Use it like this.
-mysql -u user -h host -p apachelogdatabase < create_tables.sql
-Where:
-        user is the username to log in as,
-        host is the hostname the server is on, 
-        apachelogdatabase is the database to put the tables into
-        -p will have mysql ask you for a password for the user
-
-*make_combined_log.pl
-
-This perl script will extract the data from mod_log_sql's tables in the 
-database and export a standard Apache combined log file. Use this to run
-logs through a program like webalizer.
-
-You must edit the perl script to configure variables before you run it.
-Usage:
-./make_combined_log.pl days virtualhost
-Where:
-        days is the number of days to fetch (starting from now and going back 
-                in time)
-        virtualhost is the name of the virtualhost to retrieve
-
-Example:
-        ./make_combined_log.pl 2 example.com
-
-*mysql_import_combined_log.pl
-
-This is a perl script written by Aaron Jenson that imports a combined log file
-from apache into a SQL database table.. You can use this script to import logs
-from a webserver you are converting over from the standard Apache log system to
-mod_log_sql.  A Usage statement can be fetch by running the program with no 
-parameters or with --help or -?.
+This directory contains contributed scripts/programs/utilites related to mod_log_sql.
diff --git a/contrib/mysql_import_combined_log.pl b/contrib/mysql_import_combined_log.pl
index bffec20..1c801f2 100644
--- a/contrib/mysql_import_combined_log.pl
+++ b/contrib/mysql_import_combined_log.pl
@@ -1,8 +1,4 @@
 #!/usr/bin/perl -w
-# $Id: mysql_import_combined_log.pl,v 1.4 2004/02/21 18:09:50 urkle Exp $
-# Written by Aaron Jenson.
-# Original source: http://www.visualprose.com/software.php
-# Updated to work under Perl 5.6.1 by Edward Rudd
 use strict;
 use Getopt::Long qw(:config bundling);
 use DBI;
@@ -37,44 +33,47 @@ my @cols = (
 );
 my $col = '';
 
+%options = (
+        "version" => sub { VERSION_MESSAGE(); exit 0; },
+        "help|?" => sub { HELP_MESSAGE(); exit 0; },
+        );
+
 GetOptions (\%options,
-                "version" => sub { VERSION_MESSAGE(); exit 0; },
-                "help|?" => sub { HELP_MESSAGE(); exit 0; },
-                "host|h=s",
-                "database|d=s",
-                "table|t=s",
-                "username|u=s",
-                "password|p=s",
-                "logfile|f=s");
-
-$options{host} ||= 'localhost';
-$options{database} ||= '';
-$options{username} ||= '';
-$options{password} ||= '';
-$options{logfile} ||= '';
-
-if( ! $options{database} )
+                "h|host=s",
+                "d|database=s",
+                "t|table=s",
+                "u|username=s",
+                "p|password=s",
+                "f|logfile=s");
+
+$options{h} ||= 'localhost';
+$options{d} ||= '';
+$options{u} ||= '';
+$options{p} ||= '';
+$options{f} ||= '';
+
+if( ! $options{d} )
 {
         HELP_MESSAGE();
         print "Must supply a database to connect to.\n";
         exit 1;
 }
 
-if( ! $options{table} )
+if( ! $options{t} )
 {
         HELP_MESSAGE();
         print "Must supply table name.\n";
         exit 1;
 }
 
-if( $options{logfile} )
+if( $options{f} )
 {
-        if( ! -e $options{logfile} )
+        if( ! -e $options{f} )
         {
-                print  "File '$options{logfile}' doesn't exist.\n";
+                print  "File '$options{f}' doesn't exist.\n";
                 exit 1;
         }
-        open(STDIN, "<$options{logfile}") || die "Can't open $options{logfile} for reading.";
+        open(STDIN, "<$options{f}") || die "Can't open $options{f} for reading.";
 }
 
 $dbh = Connect();
@@ -82,7 +81,7 @@ if (! $dbh) {
         exit 1;
 }
 
-$sql = "INSERT INTO $options{table} (";
+$sql = "INSERT INTO $options{t} (";
 foreach $col (@cols)
 {
         $sql .= "$col," if( $col );
@@ -115,15 +114,15 @@ while($line = <STDIN>)
 }
 print "Parsed $linecount Log lines\n";
 print "Inserted $insertcount records\n";
-print "to table '$options{table}' in database '$options{database}' on '$options{host}'\n";
+print "to table '$options{t}' in database '$options{d}' on '$options{h}'\n";
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 # Connects to a MySQL database and returns the connection.
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 sub Connect
 {
-        my $dsn = "DBI:mysql:$options{database};hostname=$options{host}";
-        return DBI->connect( $dsn, $options{username}, $options{password} );
+        my $dsn = "DBI:mysql:$options{d};hostname=$options{h}";
+        return DBI->connect( $dsn, $options{u}, $options{p} );
 }
 
 
@@ -216,9 +215,7 @@ EOF
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
 sub VERSION_MESSAGE
 {
-        print "mysql_import_combined_log.pl version 1.2\n";
-        print "Version 1.0 Written by Aaron Jenson.\n";
-        print "Update to work with perl 5.6.1 by Edward Rudd\n";
+        print "mysql_import_combined_log.pl version 1.1\n";
 }
 
 1;
diff --git a/contrib/create_tables.sql b/create_tables.sql
index 0fe0f4b..0fe0f4b 100644
--- a/contrib/create_tables.sql
+++ b/create_tables.sql
diff --git a/docs/.cvsignore b/docs/.cvsignore
deleted file mode 100644
index 73cd04a..0000000
--- a/docs/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-manual.html
-manual.pdf
diff --git a/docs/README b/docs/README
deleted file mode 100644
index dd40351..0000000
--- a/docs/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The "original" document is the Docbook file "manual.xml" -- all other
-files here are derived from it.
-
-To read the HTML docs, open manual.html in your browser.
-
-To generate other formats of the documentation use xmlto or your favorite 
-xslt docbook converter to convert the xml file.
diff --git a/functions.h b/functions.h
index dcbc939..917a1f9 100644
--- a/functions.h
+++ b/functions.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-
+/* $Header: /home/cvs/mod_log_sql/functions.h,v 1.2 2004/02/05 21:59:46 urkle Exp $ */
 /* Begin the individual functions that, given a request r,
  * extract the needed information from it and return the
  * value to the calling entity.
@@ -176,16 +175,20 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
         char *cookiebuf;
 
         if (a != NULL) {
-                log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                        "watching for cookie '%s'", a);
+                #ifdef DEBUG
+                        log_error(APLOG_MARK,APLOG_DEBUG,
+                                r->server,"watching for cookie '%s'", a);
+                #endif
 
                 /* Fetch out the cookie header */
                 cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie2");
             if (cookiestr != NULL) {
-                        log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                                "Cookie2: [%s]", cookiestr);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                        "Cookie2: [%s]", cookiestr);
+                        #endif
                         /* Does the cookie string contain one with our name? */
-                        isvalid = ap_strstr_c(cookiestr, a);
+                        isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                                 /* Move past the cookie name and equal sign */
                                 isvalid += strlen(a) + 1;
@@ -193,7 +196,7 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
                             cookiebuf = apr_pstrdup(r->pool, isvalid);
                                 /* Segregate just this cookie out of the string
                                  * with a terminating nul at the first semicolon */
-                            cookieend = ap_strchr(cookiebuf, ';');
+                            cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
                                 return cookiebuf;
@@ -202,13 +205,15 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
                 cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie");
             if (cookiestr != NULL) {
-                        log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                                "Cookie: [%s]", cookiestr);
-                        isvalid = ap_strstr_c(cookiestr, a);
+                        #ifdef DEBUG
+                                log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                        "Cookie: [%s]", cookiestr);
+                        #endif
+                        isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                                 isvalid += strlen(a) + 1;
                             cookiebuf = apr_pstrdup(r->pool, isvalid);
-                            cookieend = ap_strchr(cookiebuf, ';');
+                            cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
                                 return cookiebuf;
@@ -217,13 +222,15 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
                 cookiestr = apr_table_get(r->headers_out,  "set-cookie");
             if (cookiestr != NULL) {
-                     log_error(APLOG_MARK,APLOG_DEBUG, 0, r->server,
-                                "Set-Cookie: [%s]", cookiestr);
-                        isvalid = ap_strstr_c(cookiestr, a);
+                        #ifdef DEBUG
+                             log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                        "Set-Cookie: [%s]", cookiestr);
+                        #endif
+                        isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                             isvalid += strlen(a) + 1;
                             cookiebuf = apr_pstrdup(r->pool, isvalid);
-                            cookieend = ap_strchr(cookiebuf, ';');
+                            cookieend = strchr(cookiebuf, ';');
                             if (cookieend != NULL)
                                *cookieend = '\0';
                                 return cookiebuf;
diff --git a/functions13.h b/functions13.h
index 54e3138..7fe8850 100644
--- a/functions13.h
+++ b/functions13.h
@@ -1,4 +1,4 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/functions13.h,v 1.3 2004/02/05 21:59:46 urkle Exp $ */
 
 static const char *extract_bytes_sent(request_rec *r, char *a)
 {
diff --git a/functions20.h b/functions20.h
index ee58513..31d9e4b 100644
--- a/functions20.h
+++ b/functions20.h
@@ -1,5 +1,5 @@
-/* $Id$ */
-
+/* $Header: /home/cvs/mod_log_sql/functions20.h,v 1.3 2004/02/05 21:59:46 urkle Exp $ */
+/* functions */
 static const char *extract_bytes_sent(request_rec *r, char *a)
 {
         if (!r->sent_bodyct || !r->bytes_sent) {
diff --git a/gen_todo.pl b/gen_todo.pl
deleted file mode 100755
index 20b0894..0000000
--- a/gen_todo.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/perl
-
-#  Copyright 2003-2004 Edward Rudd
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-use strict;
-my $rootdir = ".";
-opendir(MYDIR, $rootdir) or die "Unable to open directory";
-print "Building TODO file for source directory\n";
-my $todo_header = "* Things TODO *\n\n";
-if (open ( TODOFILE, "TODO.in")) {
-        $todo_header = do { local $/; <TODOFILE> };
-        close (TODOFILE);
-}
-open (TODOFILE, "> TODO");
-print TODOFILE $todo_header;
-print "Parsing...";
-while (my $entry = readdir(MYDIR)) {
-        next if (!($entry =~ /\.[ch]$/));
-        print "$entry...";
-        open(DAFILE, $rootdir.'/'.$entry) or die "Unable to open file\n";
-        my $linenumber = 0;
-        my $status = 0; # 0=no comment 1=comment 2=in todo block
-        while (my $line = <DAFILE>) {
-                $linenumber++;
-                if ($status==0) {
-                        if ( ($line =~ /\/\/\s+TODO: (.*)/) || ($line =~ /\/\*\s+TODO: (.*)\s*\*\//) ){
-                                print TODOFILE $entry.":".$linenumber.": ".$1."\n";
-                        } else {
-                                if ($line =~ /\/\*\*/) {
-                                        $status = 1;
-                                }
-                        }
-                } else {
-                        if ($line =~ /\*\//) {
-                                $status = 0;
-                        } else {
-                                if ($status==1) {
-                                        if ($line =~ /TODO:/) {
-                                                $status=2;
-                                        }
-                                } else {
-                                        if ($line =~ /\* \s+-?\s*(.*)/) {
-                                                print TODOFILE $entry.":".$linenumber.": ".$1."\n";
-                                        }
-                                }
-                        }
-                }
-        }
-        close(DAFILE);
-}
-print "\n";
-closedir(MYDIR);
diff --git a/m4/apache.m4 b/m4/apache.m4
new file mode 100644
index 0000000..3d76b72
--- /dev/null
+++ b/m4/apache.m4
@@ -0,0 +1,175 @@
+dnl TEST_APACHE_VERSION([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for Apache
+dnl
+AC_DEFUN(TEST_APACHE_VERSION,
+[dnl
+        AC_REQUIRE([AC_CANONICAL_TARGET])
+
+        min_apache_version="$1"
+        no_apache=""
+        ac_save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $APACHE_CFLAGS"
+
+        AC_TRY_RUN([
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "httpd.h"
+
+#ifndef AP_SERVER_BASEREVISION
+        #define AP_SERVER_BASEREVISION SERVER_BASEREVISION
+#endif
+                
+char* my_strdup (char *str)
+{
+        char *new_str;
+
+        if (str) {
+                new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
+                strcpy (new_str, str);
+        } else
+                new_str = NULL;
+
+        return new_str;
+}
+
+int main (int argc, char *argv[])
+{
+        int major1, minor1, micro1;
+        int major2, minor2, micro2;
+        char *tmp_version;
+
+        { FILE *fp = fopen("conf.apachetest", "a"); if ( fp ) fclose(fp); }
+
+        tmp_version = my_strdup("$min_apache_version");
+        if (sscanf(tmp_version, "%d.%d.%d", &major1, &minor1, &micro1) != 3) {
+                printf("%s, bad version string\n", "$min_apache_version");
+                exit(1);
+        }
+        tmp_version = my_strdup(AP_SERVER_BASEREVISION);
+        if (sscanf(tmp_version, "%d.%d.%d", &major2, &minor2, &micro2) != 3) {
+                printf("%s, bad version string\n", AP_SERVER_BASEREVISION);
+                exit(1);
+        }
+        if ((major2 > major1) ||
+                ((major2 == major1) && (minor2 > minor1)) ||
+                ((major2 == major1) && (minor2 == minor1) && (micro2 >= micro1)))
+        {
+                exit(0);
+        } else {
+                /*printf("\n*** This module requires apache version %d.%d.%d or greater\n",
+                        major1, minor1, micro1);
+                printf("*** I found version %d.%d.%d. Please verify the installation directory\n",
+                        major2, minor2, micro2);
+                printf("*** of apache with the --with-apxs configure option.\n");*/
+                exit(1);
+        }
+}
+
+],, no_apache=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+        CFLAGS="$ac_save_CFLAGS"
+
+        if test "x$no_apache" = x ; then
+                ifelse([$2], , :, [$2])
+        else
+                if test -f conf.apachetest ; then
+                        :
+                else
+                        echo "*** Could not run Apache test program, checking why..."
+                        CFLAGS="$CFLAGS APACHE_CFLAGS"
+                        AC_TRY_LINK([
+#include <stdio.h>
+#include "httpd.h"
+
+int main(int argc, char *argv[])
+{ return 0; }
+#undef main
+#define main K_and_R_C_main
+],                              [ return 0; ],
+                                [ echo "*** The test program compiled, but failed to run. Check config.log" ],
+                                [ echo "*** The test program failed to compile or link. Check config.log" ])
+                        CFLAGS="$ac_save_CFLAGS"
+                fi
+                ifelse([$3], , :, [$3])
+        fi
+        rm -f conf.apachetest
+])
+
+dnl CHECK_PATH_APACHE([MINIMUM13-VERSION [, MINIMUM20-VERSION [, 
+dnl                     ACTION-IF-FOUND13 [, ACTION-IF-FOUND20 [, ACTION-IF-NOT-FOUND]]])
+dnl Test for Apache apxs
+dnl
+AC_DEFUN(CHECK_PATH_APACHE,
+[dnl
+AC_ARG_WITH(
+                apxs,
+                [AC_HELP_STRING([--with-apxs=PATH],[Location to APXS binary (default: /usr)])],
+                apxs_prefix="$withval",
+                apxs_prefix="/usr"
+        )
+AC_ARG_ENABLE(
+                apachetest,
+                [AC_HELP_STRING([--disable-apachetest],[Do not try to compile and run apache version test program])],
+                ,
+                enable_apachetest=yes
+        )
+
+        PATH="$apxs_prefix:$apxs_prefix/bin:$apxs_prefix/sbin:$PATH"
+        if test -x $apxs_prefix -a ! -d $apxs_prefix; then
+                APXS_BIN=$apxs_prefix
+        else
+                AC_PATH_PROG(APXS_BIN, apxs, no, [$PATH])
+        fi
+        min_apache13_version=ifelse([$1], ,no,$1)
+        min_apache20_version=ifelse([$2], ,no,$2)
+        no_apxs=""
+        if test "$APXS_BIN" = "no"; then
+                AC_MSG_ERROR([*** The apxs binary installed by apache could not be found!])
+                AC_MSG_ERROR([*** If apache is installed in PREFIX, make sure PREFIX/bin is in])
+                AC_MSG_ERROR([*** your path, or use the --with-apxs configure option])          
+        else
+                APACHE_INCDIR=`$APXS_BIN -q INCLUDEDIR`
+                APACHE_CPPFLAGS=`$APXS_BIN -q CFLAGS`
+                APACHE_CFLAGS="-I$APACHE_INCDIR"
+                APACHE_MODDIR=`$APXS_BIN -q LIBEXECDIR`
+
+                if test "x$enable_apachetest" = "xyes" ; then
+                        if test "$min_apache20_version" != "no"; then
+                                AC_MSG_CHECKING(for Apache 2.0 version >= $min_apache20_version)
+                                TEST_APACHE_VERSION($min_apache20_version,
+                                        AC_MSG_RESULT(yes)
+                                        AC_DEFINE(WITH_APACHE20,1,[Define to 1 if we are compiling with Apache 2.0.x])
+                                        APACHE_VERSION="20"
+                                APXS_EXTENSION=.la
+                                        APACHE_DEFS="-DWITH_APACHE20"
+                                        ifelse([$4], , , $4),
+                                        AC_MSG_RESULT(no)
+                                        if test "x$min_apache13_version" = "xno"; then
+                                                ifelse([$5], , , $5)
+                                        fi
+                                        )
+                        fi
+                        if test "$min_apache13_version" != "no" -a "x$APACHE_VERSION" = "x"; then
+                                AC_MSG_CHECKING(for Apache 1.3 version >= $min_apache13_version)
+                                TEST_APACHE_VERSION($min_apache13_version,
+                                        AC_MSG_RESULT(yes)
+                                        AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x])
+                                        APACHE_VERSION="13"
+                                        APXS_EXTENSION=.so
+                                        APACHE_CFLAGS="-g $APACHE_CFLAGS"
+                                        APACHE_DEFS="-DWITH_APACHE13"
+                                        ifelse([$3], , , $3),
+                                        AC_MSG_RESULT(no)
+                                        ifelse([$5], , , $5)
+                                        )
+                        fi
+                fi
+                AC_SUBST(APACHE_DEFS)
+                AC_SUBST(APACHE_CFLAGS)
+                AC_SUBST(APACHE_CPPFLAGS)
+                AC_SUBST(APACHE_INCDIR)
+                AC_SUBST(APACHE_MODDIR)
+                AC_SUBST(APACHE_VERSION)
+                AC_SUBST(APXS_EXTENSION)
+        fi
+])
diff --git a/m4/mod_ssl.m4 b/m4/mod_ssl.m4
new file mode 100644
index 0000000..c431bce
--- /dev/null
+++ b/m4/mod_ssl.m4
@@ -0,0 +1,50 @@
+dnl CHECK_PATH_MOD_SSL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+dnl Test for mod_ssl and openssl header directory.
+dnl
+AC_DEFUN(CHECK_PATH_MOD_SSL,
+[dnl
+AC_ARG_ENABLE(
+                ssl,
+                [AC_HELP_STRING([--enable-ssl],[Compile in SSL support])],
+                ssl_val=yes,
+                ssl_val=no
+        )
+AC_ARG_WITH(
+                ssl-inc,
+                [AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])],
+                ssl_incdir="$withval",
+        )
+AC_ARG_WITH(
+                db-inc,
+                [AC_HELP_STRING([--with-db-inc=DIR],[Location of DB header files])],
+                db_incdir="$withval",
+                db_incdir="/usr/include/db1"
+        )
+
+        if test "x$ssl_val" = "xyes"; then
+                ac_save_CFLAGS=$CFLAGS
+                ac_save_CPPFLAGS=$CPPFLAGS
+                MOD_SSL_CFLAGS="-I/usr/include/openssl"
+                if test "x$ssl_incdir" != "x"; then
+                        MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS"
+                fi
+                if test "x$db_incdir" != "x"; then
+                        MOD_SSL_CFLAGS="-I$db_incdir $MOD_SSL_CFLAGS"
+                fi
+                CFLAGS="$APACHE_CFLAGS $APACHE_CPPFLAGS $MOD_SSL_CFLAGS $CFLAGS"
+                CPPFLAGS="$APACHE_CFLAGS $APACHE_CPPFLAGS $MOD_SSL_CFLAGS $CPPFLAGS"
+                AC_CHECK_HEADERS([mod_ssl.h],
+                        mod_ssl_h=yes
+                )
+                CFLAGS=$ac_save_CFLAGS
+                CPPFLAGS=$ac_save_CPPFLAGS
+                if test "x$mod_ssl_h" = "x"; then
+                        ifelse([$2], , :, [$2])
+                else
+                        AC_SUBST(MOD_SSL_CFLAGS)
+                        ifelse([$1], , :, [$1])
+                fi
+        else
+                ifelse([$2], , :, [$2])
+        fi
+])
diff --git a/m4/mysql.m4 b/m4/mysql.m4
new file mode 100644
index 0000000..7892f88
--- /dev/null
+++ b/m4/mysql.m4
@@ -0,0 +1,64 @@
+dnl CHECK_PATH_MYSQL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUNT]])
+dnl Check for MySQL Libs
+dnl
+AC_DEFUN(CHECK_PATH_MYSQL,
+[dnl
+AC_ARG_WITH(
+                mysql,
+                [AC_HELP_STRING([--with-mysql],[Path to MySQL client library])],
+                mysql_prefix="$withval",
+                
+        )
+AC_ARG_ENABLE(
+                mysqltest,
+                [AC_HELP_STRING([--disble-mysqltest],[Do not try to compile and run mysql test program])],
+                ,
+                enable_apachetest=yes)
+
+    AC_REQUIRE([AC_CANONICAL_TARGET])
+    ac_save_CFLAGS=$CFLAGS
+    ac_save_LDFLAGS=$LDFLAGS
+    if test "x$mysql_prefix" != "x" && test "x$mysql_prefix" != "xyes"; then
+                MYSQL_LDFLAGS="-L${mysql_prefix}/lib -L${mysql_prefix}/lib/mysql -L${mysql_prefix}/mysql/lib"
+                MYSQL_CFLAGS="-I${mysql_prefix}/include -I${mysql_prefix}/include/mysql -I${mysql_prefix}/mysql/include"
+    else
+                MYSQL_LDFLAGS="-L/usr/local/mysql/lib -L/usr/lib/mysql -L/usr/mysql/lib -L/usr/local/lib/mysql -L/usr/local/mysql/lib/mysql -L/usr/mysql/lib/mysql"
+                MYSQL_CFLAGS="-I/usr/local/mysql/include -I/usr/include/mysql -I/usr/mysql/include -I/usr/local/include/mysql -I/usr/local/mysql/include/mysql -I/usr/mysql/include/mysql"
+    fi
+    CFLAGS="$CFLAGS $MYSQL_CFLAGS"
+    LDFLAGS="$LDFLAGS $MYSQL_LDFLAGS"
+    AC_CHECK_LIB(m, floor)
+    AC_CHECK_LIB(z, gzclose)
+    with_mysql="yes"
+    AC_DEFINE(WITH_MYSQL,1,[Define to 1 if we are compiling with mysql])
+    AC_CHECK_LIB(mysqlclient, mysql_init, ,
+      [AC_MSG_ERROR(libmysqlclient is needed for MySQL support)])
+    MYSQL_LIBS=$LIBS
+    AC_CHECK_FUNCS(mysql_real_escape_string)
+    AC_MSG_CHECKING(whether mysql clients can run)
+    AC_TRY_RUN([
+      #include <stdio.h>
+      #include <mysql.h>    
+      int main(void)
+      {
+          MYSQL *a = mysql_init(NULL);
+          return 0;
+      }
+      ], , no_mysql=yes,[echo $ac_n "cross compiling; assumed OK.... $ac_c"])
+      CFLAGS=$ac_save_CFLAGS
+      LDFLAGS=$ac_save_LDFLAGS
+      if test "x$no_mysql" = x; then
+                AC_MSG_RESULT(yes)
+        ifelse([$1], , :, [$1])
+      else
+        AC_MSG_RESULT(no)
+                echo "*** MySQL could not be found ***"
+                MYSQL_CFLAGS=""
+                MYSQL_LDFLAGS=""
+                MYSQL_LIBS=""
+        ifelse([$2], , :, [$2])
+      fi
+      AC_SUBST(MYSQL_LDFLAGS)
+      AC_SUBST(MYSQL_CFLAGS)
+      AC_SUBST(MYSQL_LIBS)
+])
diff --git a/contrib/make_combined_log.pl b/make_combined_log.pl
index 2c55271..1b50f11 100644
--- a/contrib/make_combined_log.pl
+++ b/make_combined_log.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: make_combined_log.pl,v 1.2 2004/02/12 23:32:55 urkle Exp $
+# $Id: make_combined_log.pl,v 1.1 2003/12/20 07:16:05 urkle Exp $
 #
 # make_combined_log.pl
 #
@@ -34,9 +34,14 @@ $| = 1;
 
 use DBI;
 
-# Remove the # in front of this line when you have 
-# edited the variables below.
-#$has_edited_source = 1;
+# Remember, $#ARGV is parameters minus one...
+if ($#ARGV != 1) {
+        die "Incorrect usage, please read the perl source code for correct usage."
+}
+
+$days     = $ARGV[0];
+$virthost = $ARGV[1];
+
 #
 # Set up the proper variables to permit database access
 #
@@ -47,20 +52,6 @@ $serverPass = "somepass";
 $serverTbl  = "acc_log_tbl";
 $serverDb   = "apache";
 
-if (!defined($has_edited_source)) {
-        print "Please edit this file and configure it first.\n";
-        print "This program is $0\n";
-        exit 1;
-}
-# Remember, $#ARGV is parameters minus one...
-if ($#ARGV != 1) {
-        print "Usage $0 days virtualhost\n";
-        exit 1;
-}
-
-$days     = $ARGV[0];
-$virthost = $ARGV[1];
-
 #
 # Other constants
 #
@@ -137,3 +128,4 @@ while (@data = $records->fetchrow_array) {
 # Done
 #
 $records->finish;
+
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                       */
diff --git a/mod_log_sql.h b/mod_log_sql.h
index 56aa2c3..f54ab54 100644
--- a/mod_log_sql.h
+++ b/mod_log_sql.h
@@ -1,5 +1,4 @@
-/* $Id$ */
-
+/* $Header: /home/cvs/mod_log_sql/mod_log_sql.h,v 1.3 2004/01/22 05:26:56 urkle Exp $ */
 #ifndef MOD_LOG_SQL_H
 #define MOD_LOG_SQL_H
 
@@ -24,104 +23,10 @@
 #define LOGSQL_DECLARE_DATA             __declspec(dllimport)
 #endif
 
-/* Registration function for extract functions */
-
-typedef const char *logsql_item_func(request_rec *r, char *a);
+typedef const char *log_sql_item_func(request_rec *r, char *a);
 
+/* Registration Function for extract functions */
 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);
-
-/* DB Connection structure holds connection handle */
-typedef struct {
-        int connected; /* Are we connected to the DB */
-        void *handle; /* DB specific connection pointer */
-        apr_table_t *parms; /* DB connection parameters */
-} logsql_dbconnection;
-
-/* open db handle return values*/
-typedef enum {
-        LOGSQL_OPENDB_FAIL = 0,
-        LOGSQL_OPENDB_SUCCESS,
-        LOGSQL_OPENDB_ALREADY,
-        LOGSQL_OPENDB_PRESERVE
-} logsql_opendb_ret;
-
-typedef enum {
-        LOGSQL_QUERY_SUCCESS = 0,
-        LOGSQL_QUERY_FAIL,
-        LOGSQL_QUERY_NOLINK,
-        LOGSQL_QUERY_NOTABLE,
-        LOGSQL_QUERY_PRESERVED
-} logsql_query_ret;
-
-typedef enum {
-        LOGSQL_TABLE_SUCCESS = 0,
-        LOGSQL_TABLE_FAIL
-} logsql_table_ret;
-
-/* Table type to create/log to */
-typedef enum {
-        LOGSQL_TABLE_ACCESS = 0,
-        LOGSQL_TABLE_NOTES,
-        LOGSQL_TABLE_HEADERSOUT,
-        LOGSQL_TABLE_HEADERSIN,
-        LOGSQL_TABLE_COOKIES
-} logsql_tabletype;
-
-/* All Tables */
-#define LOGSQL_TABLE_ALL LOGSQL_TABLE_ACCESS | LOGSQL_TABLE_NOTES | \
-        LOGSQL_TABLE_HEADERSIN | LOGSQL_TABLE_HEADERSOUT | LOGSQL_TABLE_COOKIES
-
-/* MySQL module calls */
-
-/* Registration function for database drivers */
-
-typedef struct {
-        /* NULL terminated list of drivers strings */
-        char **provided_drivers;
-        /* create a connection to the underlying database layer */
-        logsql_opendb_ret (*connect)(server_rec *s, logsql_dbconnection *db);
-        /* disconnect from the underlying database layer */
-        void (*disconnect)(logsql_dbconnection *db);
-        /* escape the SQL statement according to database rules */
-        const char *(*escape)(const char *from_str, apr_pool_t *p, 
-                logsql_dbconnection *db);
-        /* insert a SQL query statement */
-        logsql_query_ret (*insert)(request_rec *r,logsql_dbconnection *db,
-                const char *query);
-        /* create a SQL table named table_name of table_type */
-        logsql_table_ret (*create_table)(request_rec *r, logsql_dbconnection *db,
-                logsql_tabletype table_type, const char *table_name);
-} logsql_dbdriver;
-
-LOGSQL_DECLARE(void) log_sql_register_driver(apr_pool_t *p,
-                logsql_dbdriver *driver);
-
-/* Module initialization Macros */
-#if defined(WITH_APACHE20)
-#       define LOGSQL_REGISTER(driver) \
-        static int post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s); \
-        static void register_hooks(apr_pool_t *p) { \
-                ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_REALLY_FIRST); \
-        } \
-        \
-        module AP_MODULE_DECLARE_DATA log_sql_##driver##_module = { \
-                STANDARD20_MODULE_STUFF, \
-                NULL, NULL,  NULL, NULL,  NULL, register_hooks }; \
-        static int post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
-#elif defined(WITH_APACHE13)
-#       define LOGSQL_REGISTER(driver) \
-        static void module_init(server_rec *s, apr_pool_t *p); \
-        module MODULE_VAR_EXPORT log_sql_##driver##_module = { \
-                STANDARD_MODULE_STUFF, module_init }; \
-        static void module_init(server_rec *s, apr_pool_t *p)
-#endif
-
-#if defined(WITH_APACHE20)
-#define LOGSQL_REGISTER_RETURN return OK;
-#elif defined(WITH_APACHE13)
-#define LOGSQL_REGISTER_RETURN
-#endif
-
 #endif /* MOD_LOG_SQL_H */
diff --git a/mod_log_sql.prj b/mod_log_sql.prj
index bb04bb2..ad294d5 100644
--- a/mod_log_sql.prj
+++ b/mod_log_sql.prj
@@ -66,11 +66,9 @@ module.source.type=
 module.source.expanded=1
 module.source.files=\
         mod_log_sql.c\
+        make_combined_log.pl\
         contrib/mysql_import_combined_log.pl\
-        mod_log_sql_ssl.c\
-        mod_log_sql_mysql.c\
-        contrib/make_combined_log.pl\
-        mod_log_sql_pgsql.c
+        mod_log_sql_ssl.c
 
 module.pixmap.name=.
 module.pixmap.type=
@@ -98,12 +96,10 @@ module.doc.expanded=1
 module.doc.files=\
         Documentation/README\
         INSTALL\
+        Documentation/documentation.lyx\
         CHANGELOG\
         LICENSE\
-        AUTHORS\
-        TODO\
-        Documentation/manual.xml\
-        TODO.in
+        AUTHORS
 
 module.po.expanded=0
 module.po.files=
@@ -111,7 +107,8 @@ module.po.files=
 compiler.options.supports=
 compiler.options.include.paths=\
         .\
-        /usr/include/apache
+        ..\
+        /opt/apache2/include
 compiler.options.library.paths=
 compiler.options.libraries=
 compiler.options.libraries.selected=
diff --git a/mod_log_sql_mysql.c b/mod_log_sql_mysql.c
deleted file mode 100644
index e64044e..0000000
--- a/mod_log_sql_mysql.c
+++ /dev/null
@@ -1,259 +0,0 @@
-/* $Id$ */
-
-#if defined(WITH_APACHE20)
-#       include "apache20.h"
-#elif defined(WITH_APACHE13)
-#       include "apache13.h"
-#else
-#       error Unsupported Apache version
-#endif
-
-#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
-
-#include "mod_log_sql.h"
-
-#include "mysql.h"
-#include "mysqld_error.h"
-
-/* The enduser won't modify these */
-#define MYSQL_ERROR(mysql) ((mysql)?(mysql_error(mysql)):"MySQL server has gone away")
-
-/* Connect to the MYSQL database */
-static logsql_opendb_ret log_sql_mysql_connect(server_rec *s, logsql_dbconnection *db)
-{
-        const char *host = apr_table_get(db->parms,"hostname");
-        const char *user = apr_table_get(db->parms,"username");
-        const char *passwd = apr_table_get(db->parms,"password");
-        const char *database = apr_table_get(db->parms,"database");
-        const char *s_tcpport = apr_table_get(db->parms,"port");
-        unsigned int tcpport = (s_tcpport)?atoi(s_tcpport):3306;
-        const char *socketfile = apr_table_get(db->parms,"socketfile");
-        MYSQL *dblink = db->handle;
-
-        dblink = mysql_init(dblink);
-        db->handle = (void *)dblink;
-
-
-        if (!socketfile) {
-                socketfile = "/var/lib/mysql/mysql.sock";
-        }
-
-        if (mysql_real_connect(dblink, host, user, passwd, database, tcpport,
-                                                socketfile, 0)) {
-                log_error(APLOG_MARK,APLOG_DEBUG,0, s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
-                                host, tcpport, database, user, socketfile);
-                return LOGSQL_OPENDB_SUCCESS;
-        } else {
-                log_error(APLOG_MARK,APLOG_DEBUG,0, s,"mod_log_sql: database connection error: %s",
-                                MYSQL_ERROR(dblink));
-                log_error(APLOG_MARK,APLOG_DEBUG, 0, s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
-                                host, tcpport, database, user, socketfile);
-                return LOGSQL_OPENDB_FAIL;
-        }
-}
-
-/* Close the DB link */
-static void log_sql_mysql_close(logsql_dbconnection *db)
-{
-        mysql_close((MYSQL *)db->handle);
-}
-
-/* Routine to escape the 'dangerous' characters that would otherwise
- * corrupt the INSERT string: ', \, and "
- */
-static const char *log_sql_mysql_escape(const char *from_str, apr_pool_t *p, 
-                                                                logsql_dbconnection *db)
-{
-        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 (!db->connected) {
-                        /* 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((MYSQL *)db->handle, to_str, from_str, length);
-                }
-
-                if (retval)
-                  return to_str;
-                else
-                  return from_str;
-        }
-}
-#if defined(WIN32)
-#define SIGNAL_GRAB
-#define SIGNAL_RELEASE
-#define SIGNAL_VAR
-#else
-#define SIGNAL_VAR void (*handler) (int);
-#define SIGNAL_GRAB handler = signal(SIGPIPE, SIG_IGN);
-#define SIGNAL_RELEASE signal(SIGPIPE, handler);
-#endif
-/* Run a mysql insert query and return a categorized error or success */
-static logsql_query_ret log_sql_mysql_query(request_rec *r,logsql_dbconnection *db,
-                                                                const char *query)
-{
-        int retval;
-    SIGNAL_VAR
-
-        unsigned int real_error = 0;
-        /*const char *real_error_str = NULL;*/
-
-        MYSQL *dblink = (MYSQL *)db->handle;
-
-        if (!dblink) {
-                return LOGSQL_QUERY_NOLINK;
-        }
-
-        /* A failed mysql_query() may send a SIGPIPE, so we ignore that signal momentarily. */
-        SIGNAL_GRAB
-
-        /* Run the query */
-        if (!(retval = mysql_query(dblink, query))) {
-            SIGNAL_RELEASE
-                return LOGSQL_QUERY_SUCCESS;
-        }
-        /* Check to see if the error is "nonexistent table" */
-        real_error = mysql_errno(dblink);
-
-        if (real_error == ER_NO_SUCH_TABLE) {
-                log_error(APLOG_MARK,APLOG_ERR,0, r->server,"table does not exist, preserving query");
-                /* Restore SIGPIPE to its original handler function */
-            SIGNAL_RELEASE
-                return LOGSQL_QUERY_NOTABLE;
-        }
-
-        /* Restore SIGPIPE to its original handler function */
-        SIGNAL_RELEASE
-        return LOGSQL_QUERY_FAIL;
-}
-
-/* Create table table_name of type table_type. */
-static logsql_table_ret log_sql_mysql_create(request_rec *r, logsql_dbconnection *db,
-                                                logsql_tabletype table_type, const char *table_name)
-{
-        int retval;
-        const char *tabletype = apr_table_get(db->parms,"tabletype");
-        SIGNAL_VAR
-        char *type_suffix = NULL;
-
-        char *create_prefix = "create table if not exists `";
-        char *create_suffix = NULL;
-        char *create_sql;
-
-        MYSQL *dblink = (MYSQL *)db->handle;
-
-/*      if (!global_config.createtables) {
-                return APR_SUCCESS;
-        }*/
-
-        switch (table_type) {
-        case LOGSQL_TABLE_ACCESS:
-                create_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))";
-                break;
-        case LOGSQL_TABLE_COOKIES:
-        case LOGSQL_TABLE_HEADERSIN:
-        case LOGSQL_TABLE_HEADERSOUT:
-        case LOGSQL_TABLE_NOTES:
-                create_suffix = 
-        "` (id char(19),\
-           item varchar(80),\
-           val varchar(80))";
-                break;
-        }
-        
-        if (tabletype) {
-                type_suffix = apr_pstrcat(r->pool, " TYPE=", 
-                                                        tabletype, NULL);
-        }
-        /* Find memory long enough to hold the whole CREATE string + \0 */
-        create_sql = apr_pstrcat(r->pool, create_prefix, table_name, create_suffix,
-                                                type_suffix, NULL);
-
-        log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"create string: %s", create_sql);
-
-        if (!dblink) {
-                return LOGSQL_QUERY_NOLINK;
-        }
-        /* A failed mysql_query() may send a SIGPIPE, so we ignore that signal momentarily. */
-        SIGNAL_GRAB
-
-        /* Run the create query */
-        if ((retval = mysql_query(dblink, create_sql))) {
-                log_error(APLOG_MARK,APLOG_ERR,0, r->server,"failed to create table: %s",
-                        table_name);
-                SIGNAL_RELEASE
-                return LOGSQL_TABLE_FAIL;
-        }
-        SIGNAL_RELEASE
-        return LOGSQL_TABLE_SUCCESS;
-}
-
-static char *supported_drivers[] = {"mysql",NULL};
-static logsql_dbdriver mysql_driver = {
-        supported_drivers,
-        log_sql_mysql_connect,  /* open DB connection */
-        log_sql_mysql_close,    /* close DB connection */
-        log_sql_mysql_escape,   /* escape query */
-        log_sql_mysql_query,    /* insert query */
-        log_sql_mysql_create    /* create table */
-};
-
-LOGSQL_REGISTER(mysql) {
-        log_sql_register_driver(p,&mysql_driver);
-        LOGSQL_REGISTER_RETURN;
-}
diff --git a/mod_log_sql_pgsql.c b/mod_log_sql_pgsql.c
deleted file mode 100644
index 7ac4053..0000000
--- a/mod_log_sql_pgsql.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* $Id$ */
-
-#if defined(WITH_APACHE20)
-#       include "apache20.h"
-#elif defined(WITH_APACHE13)
-#       include "apache13.h"
-#else
-#       error Unsupported Apache version
-#endif
-
-
-#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
-
-#include "mod_log_sql.h"
-
-#include "libpq-fe.h"
-
-typedef struct {
-        PGconn *PG;
-        char *connectioninfo;
-} pg_conn_rec;
-
-/* Connect to the MYSQL database */
-static logsql_opendb_ret log_sql_pgsql_connect(server_rec *s, logsql_dbconnection *db)
-{
-        const char *host = apr_table_get(db->parms,"hostname");
-        const char *user = apr_table_get(db->parms,"username");
-        const char *passwd = apr_table_get(db->parms,"password");
-        const char *database = apr_table_get(db->parms,"database");
-        const char *s_tcpport = apr_table_get(db->parms,"port");
-        unsigned int tcpport = (s_tcpport)?atoi(s_tcpport):3306;
-        const char *socketfile = apr_table_get(db->parms,"socketfile");
-        pg_conn_rec *dblink = db->handle;
-
-        dblink = mysql_init(dblink);
-        db->handle = (void *)dblink;
-
-
-        if (!socketfile) {
-                socketfile = "/var/lib/mysql/mysql.sock";
-        }
-
-        if (PQconnectdb(dblink, host, user, passwd, database, tcpport,
-                                                socketfile, 0)) {
-                log_error(APLOG_MARK,APLOG_DEBUG,0, s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
-                                host, tcpport, database, user, socketfile);
-                return LOGSQL_OPENDB_SUCCESS;
-        } else {
-                log_error(APLOG_MARK,APLOG_DEBUG,0, s,"mod_log_sql: database connection error: %s",
-                                MYSQL_ERROR(dblink));
-                log_error(APLOG_MARK,APLOG_DEBUG, 0, s,"HOST: '%s' PORT: '%d' DB: '%s' USER: '%s' SOCKET: '%s'",
-                                host, tcpport, database, user, socketfile);
-                return LOGSQL_OPENDB_FAIL;
-        }
-}
-
-/* Close the DB link */
-static void log_sql_pgsql_close(logsql_dbconnection *db)
-{
-        PQfinish(((pg_conn_rec *)db->handle)->PG);
-}
-
-/* Routine to escape the 'dangerous' characters that would otherwise
- * corrupt the INSERT string: ', \, and "
- */
-static const char *log_sql_pgsql_escape(const char *from_str, apr_pool_t *p, 
-                                                                logsql_dbconnection *db)
-{
-        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 (!db->connected) {
-                        /* 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((MYSQL *)db->handle, to_str, from_str, length);
-                }
-
-                if (retval)
-                  return to_str;
-                else
-                  return from_str;
-        }
-}
-
-/* Run a mysql insert query and return a categorized error or success */
-static logsql_query_ret log_sql_pgsql_query(request_rec *r,logsql_dbconnection *db,
-                                                                const char *query)
-{
-        int retval;
-        void (*handler) (int);
-        unsigned int real_error = 0;
-        /*const char *real_error_str = NULL;*/
-
-        pg_conn_rec *dblink = db->handle;
-
-        if (!dblink) {
-                return LOGSQL_QUERY_NOLINK;
-        }
-        /* A failed mysql_query() may send a SIGPIPE, so we ignore that signal momentarily. */
-        handler = signal(SIGPIPE, SIG_IGN);
-
-        /* Run the query */
-        if (!(retval = mysql_query(dblink, query))) {
-                signal(SIGPIPE, handler);
-                return LOGSQL_QUERY_SUCCESS;
-        }
-        /* Check to see if the error is "nonexistent table" */
-        real_error = mysql_errno(dblink);
-
-        if (real_error == ER_NO_SUCH_TABLE) {
-                log_error(APLOG_MARK,APLOG_ERR,0, r->server,"table does not exist, preserving query");
-                /* Restore SIGPIPE to its original handler function */
-                signal(SIGPIPE, handler);
-                return LOGSQL_QUERY_NOTABLE;
-        }
-
-        /* Restore SIGPIPE to its original handler function */
-        signal(SIGPIPE, handler);
-        return LOGSQL_QUERY_FAIL;
-}
-
-/* Create table table_name of type table_type. */
-static logsql_table_ret log_sql_pgsql_create(request_rec *r, logsql_dbconnection *db,
-                                                logsql_tabletype table_type, const char *table_name)
-{
-        int retval;
-        const char *tabletype = apr_table_get(db->parms,"tabletype");
-        void (*handler) (int);
-        char *type_suffix = NULL;
-
-        char *create_prefix = "create table if not exists `";
-        char *create_suffix = NULL;
-        char *create_sql;
-
-        pg_conn_rec *dblink = db->handle;
-
-/*      if (!global_config.createtables) {
-                return APR_SUCCESS;
-        }*/
-
-        switch (table_type) {
-        case LOGSQL_TABLE_ACCESS:
-                create_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))";
-                break;
-        case LOGSQL_TABLE_COOKIES:
-        case LOGSQL_TABLE_HEADERSIN:
-        case LOGSQL_TABLE_HEADERSOUT:
-        case LOGSQL_TABLE_NOTES:
-                create_suffix = 
-        "` (id char(19),\
-           item varchar(80),\
-           val varchar(80))";
-                break;
-        }
-        
-        if (tabletype) {
-                type_suffix = apr_pstrcat(r->pool, " TYPE=", 
-                                                        tabletype, NULL);
-        }
-        /* Find memory long enough to hold the whole CREATE string + \0 */
-        create_sql = apr_pstrcat(r->pool, create_prefix, table_name, create_suffix,
-                                                type_suffix, NULL);
-
-        log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"create string: %s", create_sql);
-
-        if (!dblink) {
-                return LOGSQL_QUERY_NOLINK;
-        }
-        /* A failed mysql_query() may send a SIGPIPE, so we ignore that signal momentarily. */
-        handler = signal(SIGPIPE, SIG_IGN);
-
-        /* Run the create query */
-        if ((retval = mysql_query(dblink, create_sql))) {
-                log_error(APLOG_MARK,APLOG_ERR,0, r->server,"failed to create table: %s",
-                        table_name);
-                signal(SIGPIPE, handler);
-                return LOGSQL_TABLE_FAIL;
-        }
-        signal(SIGPIPE, handler);
-        return LOGSQL_TABLE_SUCCESS;
-}
-
-static char *supported_drivers[] = {"pgsql",NULL};
-static logsql_dbdriver pgsql_driver = {
-        supported_drivers,
-        log_sql_pgsql_connect,  /* open DB connection */
-        log_sql_pgsql_close,    /* close DB connection */
-        log_sql_pgsql_escape,   /* escape query */
-        log_sql_pgsql_query,    /* insert query */
-        log_sql_pgsql_create    /* create table */
-};
-
-LOGSQL_REGISTER(pgsql) {
-        log_sql_register_driver(p,&pgsql_driver);
-        LOGSQL_REGISTER_RETURN;
-}
diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c
index 8b792db..c874a2b 100644
--- a/mod_log_sql_ssl.c
+++ b/mod_log_sql_ssl.c
@@ -1,4 +1,5 @@
-/* $Id$ */
+/* $Header: /home/cvs/mod_log_sql/mod_log_sql_ssl.c,v 1.4 2004/01/22 05:26:56 urkle Exp $ */
+/* mod_log_sql_ssl */
 
 #if defined(WITH_APACHE20)
 #       include "apache20.h"
@@ -22,7 +23,6 @@
 #endif
 
 #include "mod_log_sql.h"
-
 #include "mod_ssl.h"
 
 #if defined(WITH_APACHE20)
@@ -37,7 +37,9 @@ static const char *extract_ssl_keysize(request_rec *r, char *a)
         if (TEST_SSL(r) != NULL)
         {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE");
-            log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_KEYSIZE: %s", result);
+                #ifdef DEBUG
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
+                #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -52,7 +54,9 @@ static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
         if (TEST_SSL(r) != NULL) 
         {
                 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE");
-            log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_ALGKEYSIZE: %s", result);
+                #ifdef DEBUG
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
+                #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -67,7 +71,9 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
         if (TEST_SSL(r) != NULL)
         {
             result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER");
-            log_error(APLOG_MARK,APLOG_DEBUG,0, r->server,"SSL_CIPHER: %s", result);
+                #ifdef DEBUG
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
+                #endif
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -76,11 +82,58 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
         }
 }
 
-
-LOGSQL_REGISTER(ssl)
+#if defined(WITH_APACHE20)
+static int post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp, server_rec *s)
+#elif defined(WITH_APACHE13)
+static void module_init(server_rec *s, apr_pool_t *p)
+#endif
 {
         log_sql_register_item(s,p,'q', extract_ssl_keysize,       "ssl_keysize",      0, 1);
         log_sql_register_item(s,p,'Q', extract_ssl_maxkeysize,    "ssl_maxkeysize",   0, 1);
         log_sql_register_item(s,p,'z', extract_ssl_cipher,        "ssl_cipher",       0, 1);
-        LOGSQL_REGISTER_RETURN;
+#if defined(WITH_APACHE20)
+        return OK;
+#endif
 }
+
+/* The configuration array that sets up the hooks into the module. */
+#if defined(WITH_APACHE20)
+static void register_hooks(apr_pool_t *p) {
+        ap_hook_post_config(post_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
+}
+
+module AP_MODULE_DECLARE_DATA log_sql_ssl_module = {
+        STANDARD20_MODULE_STUFF,
+        NULL,           /* create per-directory config structures */
+    NULL,               /* merge per-directory config structures */
+    NULL,               /* create per-server config structures */
+    NULL,               /* merge per-server config structures     */
+    NULL,               /* command handlers */
+    register_hooks      /* register hooks */
+};
+#elif defined(WITH_APACHE13)
+module log_sql_ssl_module = {
+        STANDARD_MODULE_STUFF,
+        module_init,                    /* module initializer                           */
+        NULL,                                   /* create per-dir config                        */
+        NULL,                                   /* merge per-dir config                         */
+        NULL,                                   /* create server config                         */
+        NULL,                                   /* merge server config                  */
+        NULL,                   /* config directive table                       */
+        NULL,                                   /* [9] content handlers                         */
+        NULL,                                   /* [2] URI-to-filename translation */
+        NULL,                                   /* [5] check/validate user_id           */
+        NULL,                                   /* [6] check authorization              */
+        NULL,                                   /* [4] check access by host             */
+        NULL,                                   /* [7] MIME type checker/setter         */
+        NULL,                                   /* [8] fixups                                           */
+        NULL,   /* [10] logger                                  */
+        NULL                                    /* [3] header parser                            */
+#if MODULE_MAGIC_NUMBER >= 19970728 /* 1.3-dev or later support these additionals... */
+        ,NULL,   /* child process initializer           */
+        NULL,    /* process exit/cleanup                        */
+        NULL                                     /* [1] post read-request                       */
+#endif
+
+};
+#endif
diff --git a/winconfig.h b/winconfig.h
deleted file mode 100644
index c4b4353..0000000
--- a/winconfig.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the `m' library (-lm). */
-/* #undef HAVE_LIBM */
-
-/* Define to 1 if you have the `mysqlclient' library (-lmysqlclient). */
-#define HAVE_LIBMYSQLCLIENT 1
-
-/* Define to 1 if you have the `z' library (-lz). */
-/* #undef HAVE_LIBZ */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <mod_ssl.h> header file. */
-/* #undef HAVE_MOD_SSL_H */
-
-/* Define to 1 if you have the `mysql_real_escape_string' function. */
-#define HAVE_MYSQL_REAL_ESCAPE_STRING 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-/* #undef HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-/* #undef HAVE_STRING_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-/* #undef HAVE_SYS_STAT_H */
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-/* #undef HAVE_SYS_TYPES_H */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "mod_log_sql"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "mod_log_sql 1.97"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "mod-log-sql"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.97"
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* Define if we want to compile in SSL support. */
-/* #undef WANT_SSL_LOGGING */
-
-/* Define to 1 if we are compiling with Apache 1.3.x */
-/* #undef WITH_APACHE13 */
-
-/* Define to 1 if we are compiling with Apache 2.0.x */
-/* #undef WITH_APACHE20 */
-
-/* Define to 1 if we are compiling with mysql */
-#define WITH_MYSQL 1
-