summaryrefslogtreecommitdiffstats
path: root/mod_log_sql.c
diff options
context:
space:
mode:
Diffstat (limited to 'mod_log_sql.c')
-rw-r--r--mod_log_sql.c40
1 files changed, 23 insertions, 17 deletions
diff --git a/mod_log_sql.c b/mod_log_sql.c
index 7ec2100..64896ab 100644
--- a/mod_log_sql.c
+++ b/mod_log_sql.c
@@ -1,4 +1,4 @@
1/* $Header: /home/cvs/mod_log_sql/mod_log_sql.c,v 1.5 2003/12/30 21:05:30 urkle Exp $ */ 1/* $Header: /home/cvs/mod_log_sql/mod_log_sql.c,v 1.6 2004/01/04 03:23:21 urkle Exp $ */
2/* --------* 2/* --------*
3 * DEFINES * 3 * DEFINES *
4 * --------*/ 4 * --------*/
@@ -31,16 +31,6 @@
31 31
32#include "util_time.h" 32#include "util_time.h"
33 33
34#if APR_HAVE_UNISTD_H
35#include <unistd.h>
36#endif
37#ifdef HAVE_LIMITS_H
38#include <limits.h>
39#endif
40
41#include "mysql.h"
42#include "mysqld_error.h"
43
44#ifdef HAVE_CONFIG_H 34#ifdef HAVE_CONFIG_H
45/* Undefine these to prevent conflicts between Apache ap_config_auto.h and 35/* Undefine these to prevent conflicts between Apache ap_config_auto.h and
46 * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt. 36 * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt.
@@ -54,6 +44,16 @@
54#include "config.h" 44#include "config.h"
55#endif 45#endif
56 46
47#if APR_HAVE_UNISTD_H
48#include <unistd.h>
49#endif
50#ifdef HAVE_LIMITS_H
51#include <limits.h>
52#endif
53
54#include "mysql.h"
55#include "mysqld_error.h"
56
57#ifdef WANT_SSL_LOGGING 57#ifdef WANT_SSL_LOGGING
58#include "mod_ssl.h" 58#include "mod_ssl.h"
59#endif 59#endif
@@ -178,11 +178,13 @@ static const char *extract_remote_user(request_rec *r, char *a)
178static const char *extract_ssl_keysize(request_rec *r, char *a) 178static const char *extract_ssl_keysize(request_rec *r, char *a)
179{ 179{
180 char *result = NULL; 180 char *result = NULL;
181 SSLConnRec *scc = myConnConfig(r->connection);
182 SSLSrvConfigRec *ssc = mySrvConfig(r->server);
181 183
182 if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) { 184 if (myCtxConfig(scc,ssc) != NULL) {
183 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE"); 185 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_USEKEYSIZE");
184 #ifdef DEBUG 186 #ifdef DEBUG
185 ap_log_error(APLOG_MARK,APLOG_DEBUG,r->server,"SSL_KEYSIZE: %s", result); 187 ap_log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_KEYSIZE: %s", result);
186 #endif 188 #endif
187 if (result != NULL && result[0] == '\0') 189 if (result != NULL && result[0] == '\0')
188 result = NULL; 190 result = NULL;
@@ -195,11 +197,13 @@ static const char *extract_ssl_keysize(request_rec *r, char *a)
195static const char *extract_ssl_maxkeysize(request_rec *r, char *a) 197static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
196{ 198{
197 char *result = NULL; 199 char *result = NULL;
200 SSLConnRec *scc = myConnConfig(r->connection);
201 SSLSrvConfigRec *ssc = mySrvConfig(r->server);
198 202
199 if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) { 203 if (myCtxConfig(scc,ssc) != NULL) {
200 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE"); 204 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE");
201 #ifdef DEBUG 205 #ifdef DEBUG
202 ap_log_error(APLOG_MARK,APLOG_DEBUG,r->server,"SSL_ALGKEYSIZE: %s", result); 206 ap_log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_ALGKEYSIZE: %s", result);
203 #endif 207 #endif
204 if (result != NULL && result[0] == '\0') 208 if (result != NULL && result[0] == '\0')
205 result = NULL; 209 result = NULL;
@@ -212,11 +216,13 @@ static const char *extract_ssl_maxkeysize(request_rec *r, char *a)
212static const char *extract_ssl_cipher(request_rec *r, char *a) 216static const char *extract_ssl_cipher(request_rec *r, char *a)
213{ 217{
214 char *result = NULL; 218 char *result = NULL;
219 SSLConnRec *scc = myConnConfig(r->connection);
220 SSLSrvConfigRec *ssc = mySrvConfig(r->server);
215 221
216 if (ap_ctx_get(r->connection->client->ctx, "ssl") != NULL) { 222 if (myCtxConfig(scc,ssc) != NULL) {
217 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER"); 223 result = ssl_var_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER");
218 #ifdef DEBUG 224 #ifdef DEBUG
219 ap_log_error(APLOG_MARK,APLOG_DEBUG,r->server,"SSL_CIPHER: %s", result); 225 ap_log_error(APLOG_MARK,APLOG_DEBUG,0,r->server,"SSL_CIPHER: %s", result);
220 #endif 226 #endif
221 if (result != NULL && result[0] == '\0') 227 if (result != NULL && result[0] == '\0')
222 result = NULL; 228 result = NULL;