3 files changed, 11 insertions, 29 deletions

diff --git a/functions.h b/functions.h
index 696ef60..540376e 100644
--- a/functions.h
+++ b/functions.h
@@ -1,4 +1,4 @@
-/* $Header: /home/cvs/mod_log_sql/functions.h,v 1.3 2004/03/04 05:41:12 urkle Exp $ */
+/* $Header: /home/cvs/mod_log_sql/functions.h,v 1.4 2004/03/04 05:43:20 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.
@@ -201,10 +201,8 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
                 cookiestr  = (char *)apr_table_get(r->headers_in,  "cookie");
             if (cookiestr != NULL) {
-                        #ifdef DEBUG
-                                log_error(APLOG_MARK,APLOG_DEBUG,r->server,
-                                        "Cookie: [%s]", cookiestr);
-                        #endif
+                        log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                "Cookie: [%s]", cookiestr);
                         isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                                 isvalid += strlen(a) + 1;
@@ -218,10 +216,8 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
 
                 cookiestr = apr_table_get(r->headers_out,  "set-cookie");
             if (cookiestr != NULL) {
-                        #ifdef DEBUG
-                             log_error(APLOG_MARK,APLOG_DEBUG,r->server,
-                                        "Set-Cookie: [%s]", cookiestr);
-                        #endif
+                     log_error(APLOG_MARK,APLOG_DEBUG,r->server,
+                                "Set-Cookie: [%s]", cookiestr);
                         isvalid = strstr(cookiestr, a);
                         if (isvalid != NULL) {
                             isvalid += strlen(a) + 1;
diff --git a/mod_log_sql.c b/mod_log_sql.c
index bce803e..754a224 100644
--- a/mod_log_sql.c
+++ b/mod_log_sql.c
@@ -1,10 +1,4 @@
-/* $Id: mod_log_sql.c,v 1.18 2004/03/04 05:41:12 urkle Exp $ */
-/* --------*
- * DEFINES *
- * --------*/
-
-/* The enduser may wish to modify this */
-#define DEBUG
+/* $Id: mod_log_sql.c,v 1.19 2004/03/04 05:43:20 urkle Exp $ */
 
 #if defined(WITH_APACHE20)
 #       include "apache20.h"
@@ -787,9 +781,7 @@ static int log_sql_transaction(request_rec *orig)
                         note_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s",
                                 /*global_config.insertdelayed?"delayed":*/"", notes_tablename, itemsets);
 
-                        #ifdef DEBUG
-                                log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: note string: %s", note_query);
-                        #endif
+                        log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: note string: %s", note_query);
                 }
 
                 /* Work through the list of headers-out defined by LogSQLWhichHeadersOut*/
diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c
index 2bdb37b..fd68a7d 100644
--- a/mod_log_sql_ssl.c
+++ b/mod_log_sql_ssl.c
@@ -1,4 +1,4 @@
-/* $Id: mod_log_sql_ssl.c,v 1.5 2004/02/29 23:36:18 urkle Exp $ */
+/* $Id: mod_log_sql_ssl.c,v 1.6 2004/03/04 05:43:20 urkle Exp $ */
 /* mod_log_sql_ssl */
 
 #if defined(WITH_APACHE20)
@@ -37,9 +37,7 @@ 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");
-                #ifdef DEBUG
-            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
-                #endif
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -54,9 +52,7 @@ 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");
-                #ifdef DEBUG
-            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
-                #endif
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;
@@ -71,9 +67,7 @@ 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");
-                #ifdef DEBUG
-            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
-                #endif
+            log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
                 if (result != NULL && result[0] == '\0')
               result = NULL;
                 return result;