From 197e405e8e8ae8e11bb251305043810c7fa93e4e Mon Sep 17 00:00:00 2001
From: Edward Rudd <urkle@outoforder.cc>
Date: Fri, 16 Jul 2004 01:33:59 +0000
Subject: fixed another segfault related to the mysql escaping function (forcepreserve bug)

included win32 build bat files in distribution
separated -Werror to a configure time option (--enable-maintainer)
update autogen to use autoconf 2.57, aclocal 1.7
included pgsql and dbi module source in distribution.
setup autodetection in configure script for databases.

---
(limited to 'mod_log_sql.c')

diff --git a/mod_log_sql.c b/mod_log_sql.c
index dace2d4..7aaa595 100644
--- a/mod_log_sql.c
+++ b/mod_log_sql.c
@@ -154,7 +154,7 @@ static logsql_opendb_ret log_sql_opendb_link(server_rec* s)
 {
 	logsql_opendb_ret result;
 	if (global_config.forcepreserve) {
-		global_config.db.connected = 1;
+		//global_config.db.connected = 1;
 		return LOGSQL_OPENDB_PRESERVE;
 	}
 	if (global_config.db.connected) {
@@ -1054,10 +1054,10 @@ static int log_sql_transaction(request_rec *orig)
 
 		/* How's our mysql link integrity? */
 		if (!global_config.db.connected) {
-
-			/* Make a try to establish the link */
-			log_sql_opendb_link(r->server);
-
+            if (!global_config.forcepreserve) {
+			    /* Make a try to establish the link */
+			    log_sql_opendb_link(r->server);
+            }
 			if (!global_config.db.connected) {
 				/* Unable to re-establish a DB link, so assume that it's really
 				 * gone and send the entry to the preserve file instead.
--
cgit v0.9.2