From 99bc864e36e2a46ac23cdc51f6f9bbcc6ef5c193 Mon Sep 17 00:00:00 2001 From: Doug MacEachern Date: Fri, 24 Aug 2001 18:06:47 +0000 Subject: [PATCH] enable i/o debugging git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90645 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/mod_ssl.c | 7 +------ modules/ssl/ssl_engine_io.c | 9 +++++++++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index a5ee4ba0e0..033c5af35a 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -285,12 +285,7 @@ static int ssl_hook_pre_connection(conn_rec *c) */ SSL_set_tmp_rsa_callback(ssl, ssl_callback_TmpRSA); SSL_set_tmp_dh_callback(ssl, ssl_callback_TmpDH); -#if 0 /* XXX */ - if (sc->nLogLevel >= SSL_LOG_DEBUG) { - BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb); - BIO_set_callback_arg(SSL_get_rbio(ssl), ssl); - } -#endif + /* * Predefine some client verification results */ diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index c29917b8d1..79dc55e8a5 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -414,6 +414,7 @@ static apr_status_t ssl_io_filter_cleanup (void *data) void ssl_io_filter_init(conn_rec *c, SSL *ssl) { + SSLSrvConfigRec *sc = mySrvConfig(c->base_server); SSLFilterRec *filter; filter = apr_pcalloc(c->pool, sizeof(SSLFilterRec)); @@ -429,6 +430,14 @@ void ssl_io_filter_init(conn_rec *c, SSL *ssl) apr_pool_cleanup_register(c->pool, (void*)filter, ssl_io_filter_cleanup, apr_pool_cleanup_null); + if (sc->nLogLevel >= SSL_LOG_DEBUG) { + /* XXX: this will currently get wiped out if renegotiation + * happens in ssl_hook_Access + */ + BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb); + BIO_set_callback_arg(SSL_get_rbio(ssl), ssl); + } + return; } -- 2.40.0