From fea85e203cb6991f816e49a565ba874a12ddea6c Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 25 Mar 2004 19:36:32 +0000 Subject: [PATCH] * modules/ssl/ssl_engine_io.c (ssl_io_filter_cleanup): Don't try and send an SSL shutdown from a pool cleanup. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103156 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_io.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 0bd5e2bf32..de71166335 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -984,22 +984,20 @@ static apr_status_t ssl_filter_io_shutdown(ssl_filter_ctx_t *filter_ctx, static apr_status_t ssl_io_filter_cleanup(void *data) { - apr_status_t ret; - ssl_filter_ctx_t *filter_ctx = (ssl_filter_ctx_t *)data; - conn_rec *c; + ssl_filter_ctx_t *filter_ctx = data; - if (!filter_ctx->pssl) { - /* already been shutdown */ - return APR_SUCCESS; - } + if (filter_ctx->pssl) { + conn_rec *c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl); + SSLConnRec *sslconn = myConnConfig(c); - c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl); - if ((ret = ssl_filter_io_shutdown(filter_ctx, c, 0)) != APR_SUCCESS) { - ap_log_error(APLOG_MARK, APLOG_INFO, ret, NULL, - "SSL filter error shutting down I/O"); - } + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL, + "SSL connection destroyed without being closed"); - return ret; + SSL_free(filter_ctx->pssl); + sslconn->ssl = filter_ctx->pssl = NULL; + } + + return APR_SUCCESS; } /* -- 2.50.1