diff options
Diffstat (limited to 'mod_log_sql_ssl.c')
-rw-r--r-- | mod_log_sql_ssl.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/mod_log_sql_ssl.c b/mod_log_sql_ssl.c index d94a79f..47bba8b 100644 --- a/mod_log_sql_ssl.c +++ b/mod_log_sql_ssl.c | |||
@@ -9,7 +9,7 @@ | |||
9 | #endif | 9 | #endif |
10 | 10 | ||
11 | #ifdef HAVE_CONFIG_H | 11 | #ifdef HAVE_CONFIG_H |
12 | /* Undefine these to prevent conflicts between Apache ap_config_auto.h and | 12 | /* Undefine these to prevent conflicts between Apache ap_config_auto.h and |
13 | * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt. | 13 | * my config.h. Only really needed for Apache < 2.0.48, but it can't hurt. |
14 | */ | 14 | */ |
15 | #undef PACKAGE_BUGREPORT | 15 | #undef PACKAGE_BUGREPORT |
@@ -52,7 +52,7 @@ static const char *extract_ssl_keysize(request_rec *r, char *a) | |||
52 | static const char *extract_ssl_maxkeysize(request_rec *r, char *a) | 52 | static const char *extract_ssl_maxkeysize(request_rec *r, char *a) |
53 | { | 53 | { |
54 | char *result = NULL; | 54 | char *result = NULL; |
55 | if (TEST_SSL(r) != NULL) | 55 | if (TEST_SSL(r) != NULL) |
56 | { | 56 | { |
57 | result = header_ssl_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE"); | 57 | result = header_ssl_lookup(r->pool, r->server, r->connection, r, "SSL_CIPHER_ALGKEYSIZE"); |
58 | 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); |
@@ -84,9 +84,21 @@ static const char *extract_ssl_cipher(request_rec *r, char *a) | |||
84 | 84 | ||
85 | LOGSQL_REGISTER(ssl) | 85 | LOGSQL_REGISTER(ssl) |
86 | { | 86 | { |
87 | log_sql_register_item(s,p,'q', extract_ssl_keysize, "ssl_keysize", 0, 1); | 87 | log_sql_register_function(p, "ssl_keysize", extract_ssl_keysize, LOGSQL_FUNCTION_REQ_FINAL); |
88 | log_sql_register_item(s,p,'Q', extract_ssl_maxkeysize, "ssl_maxkeysize", 0, 1); | 88 | log_sql_register_function(p, "ssl_maxkeysize", extract_ssl_maxkeysize, LOGSQL_FUNCTION_REQ_FINAL); |
89 | log_sql_register_item(s,p,'z', extract_ssl_cipher, "ssl_cipher", 0, 1); | 89 | log_sql_register_function(p, "ssl_cipher", extract_ssl_cipher, LOGSQL_FUNCTION_REQ_FINAL); |
90 | |||
91 | log_sql_register_alias(s,p,'q', "ssl_keysize"); | ||
92 | log_sql_register_alias(s,p,'Q', "ssl_maxkeysize"); | ||
93 | log_sql_register_alias(s,p,'z', "ssl_cipher"); | ||
94 | |||
95 | log_sql_register_field(p, "ssl_keysize", "ssl_keysize", NULL, | ||
96 | "ssl_keysize", LOGSQL_DATATYPE_VARCHAR, 0); | ||
97 | log_sql_register_field(p, "ssl_maxkeysize", "ssl_maxkeysize", NULL, | ||
98 | "ssl_maxkeysize", LOGSQL_DATATYPE_VARCHAR, 0); | ||
99 | log_sql_register_field(p, "ssl_cipher", "ssl_cipher", NULL, | ||
100 | "ssl_cipher", LOGSQL_DATATYPE_VARCHAR, 0); | ||
101 | |||
90 | #if defined(WITH_APACHE20) | 102 | #if defined(WITH_APACHE20) |
91 | header_ssl_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup); | 103 | header_ssl_lookup = APR_RETRIEVE_OPTIONAL_FN(ssl_var_lookup); |
92 | #endif | 104 | #endif |