summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Edward Rudd 2004-03-04 05:43:20 +0000
committerGravatar Edward Rudd 2004-03-04 05:43:20 +0000
commita3d0fadb9bbc2a70cac6d46b768822b1875a1811 (patch)
treeae2bacfddb668305470829347009c35f243f8871
parentec60974ca79594150b33692683b2d8bb800a896f (diff)
removed all #ifdef DEBUG
-rw-r--r--functions.h14
-rw-r--r--mod_log_sql.c12
-rw-r--r--mod_log_sql_ssl.c14
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 @@
1/* $Header: /home/cvs/mod_log_sql/functions.h,v 1.3 2004/03/04 05:41:12 urkle Exp $ */ 1/* $Header: /home/cvs/mod_log_sql/functions.h,v 1.4 2004/03/04 05:43:20 urkle Exp $ */
2/* Begin the individual functions that, given a request r, 2/* Begin the individual functions that, given a request r,
3 * extract the needed information from it and return the 3 * extract the needed information from it and return the
4 * value to the calling entity. 4 * value to the calling entity.
@@ -201,10 +201,8 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
201 201
202 cookiestr = (char *)apr_table_get(r->headers_in, "cookie"); 202 cookiestr = (char *)apr_table_get(r->headers_in, "cookie");
203 if (cookiestr != NULL) { 203 if (cookiestr != NULL) {
204 #ifdef DEBUG 204 log_error(APLOG_MARK,APLOG_DEBUG,r->server,
205 log_error(APLOG_MARK,APLOG_DEBUG,r->server, 205 "Cookie: [%s]", cookiestr);
206 "Cookie: [%s]", cookiestr);
207 #endif
208 isvalid = strstr(cookiestr, a); 206 isvalid = strstr(cookiestr, a);
209 if (isvalid != NULL) { 207 if (isvalid != NULL) {
210 isvalid += strlen(a) + 1; 208 isvalid += strlen(a) + 1;
@@ -218,10 +216,8 @@ static const char *extract_specific_cookie(request_rec *r, char *a)
218 216
219 cookiestr = apr_table_get(r->headers_out, "set-cookie"); 217 cookiestr = apr_table_get(r->headers_out, "set-cookie");
220 if (cookiestr != NULL) { 218 if (cookiestr != NULL) {
221 #ifdef DEBUG 219 log_error(APLOG_MARK,APLOG_DEBUG,r->server,
222 log_error(APLOG_MARK,APLOG_DEBUG,r->server, 220 "Set-Cookie: [%s]", cookiestr);
223 "Set-Cookie: [%s]", cookiestr);
224 #endif
225 isvalid = strstr(cookiestr, a); 221 isvalid = strstr(cookiestr, a);
226 if (isvalid != NULL) { 222 if (isvalid != NULL) {
227 isvalid += strlen(a) + 1; 223 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 @@
1/* $Id: mod_log_sql.c,v 1.18 2004/03/04 05:41:12 urkle Exp $ */ 1/* $Id: mod_log_sql.c,v 1.19 2004/03/04 05:43:20 urkle Exp $ */
2/* --------*
3 * DEFINES *
4 * --------*/
5
6/* The enduser may wish to modify this */
7#define DEBUG
8 2
9#if defined(WITH_APACHE20) 3#if defined(WITH_APACHE20)
10# include "apache20.h" 4# include "apache20.h"
@@ -787,9 +781,7 @@ static int log_sql_transaction(request_rec *orig)
787 note_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s", 781 note_query = apr_psprintf(r->pool, "insert %s into `%s` (id, item, val) values %s",
788 /*global_config.insertdelayed?"delayed":*/"", notes_tablename, itemsets); 782 /*global_config.insertdelayed?"delayed":*/"", notes_tablename, itemsets);
789 783
790 #ifdef DEBUG 784 log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: note string: %s", note_query);
791 log_error(APLOG_MARK,APLOG_DEBUG,orig->server,"mod_log_sql: note string: %s", note_query);
792 #endif
793 } 785 }
794 786
795 /* Work through the list of headers-out defined by LogSQLWhichHeadersOut*/ 787 /* 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 @@
1/* $Id: mod_log_sql_ssl.c,v 1.5 2004/02/29 23:36:18 urkle Exp $ */ 1/* $Id: mod_log_sql_ssl.c,v 1.6 2004/03/04 05:43:20 urkle Exp $ */
2/* mod_log_sql_ssl */ 2/* mod_log_sql_ssl */
3 3
4#if defined(WITH_APACHE20) 4#if defined(WITH_APACHE20)
@@ -37,9 +37,7 @@ static const char *extract_ssl_keysize(request_rec *r, char *a)
37 if (TEST_SSL(r) != NULL) 37 if (TEST_SSL(r) != NULL)
38 { 38 {
39 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE"); 39 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE");
40 #ifdef DEBUG 40 log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
41 log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
42 #endif
43 if (result != NULL && result[0] == '\0') 41 if (result != NULL && result[0] == '\0')
44 result = NULL; 42 result = NULL;
45 return result; 43 return result;
@@ -54,9 +52,7 @@ static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
54 if (TEST_SSL(r) != NULL) 52 if (TEST_SSL(r) != NULL)
55 { 53 {
56 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE"); 54 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE");
57 #ifdef DEBUG 55 log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
58 log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
59 #endif
60 if (result != NULL && result[0] == '\0') 56 if (result != NULL && result[0] == '\0')
61 result = NULL; 57 result = NULL;
62 return result; 58 return result;
@@ -71,9 +67,7 @@ static const char *extract_ssl_cipher(request_rec *r, char *a)
71 if (TEST_SSL(r) != NULL) 67 if (TEST_SSL(r) != NULL)
72 { 68 {
73 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER"); 69 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER");
74 #ifdef DEBUG 70 log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
75 log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
76 #endif
77 if (result != NULL && result[0] == '\0') 71 if (result != NULL && result[0] == '\0')
78 result = NULL; 72 result = NULL;
79 return result; 73 return result;