www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

* modules/ssl/ssl_engine_io.c (ssl_io_filter_cleanup): Don't try and

Browse Source 
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
This commit is contained in:
Joe Orton
2004-03-25 19:36:32 +00:00
parent 975c5c760f
commit fea85e203c
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
modules/ssl/ssl_engine_io.c
View File

@@ -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) static apr_status_t ssl_io_filter_cleanup(void *data)
{ {
apr_status_t ret; ssl_filter_ctx_t *filter_ctx = data;
ssl_filter_ctx_t *filter_ctx = (ssl_filter_ctx_t *)data;
conn_rec *c;
if (!filter_ctx->pssl) { if (filter_ctx->pssl) {
/* already been shutdown */ conn_rec *c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl);
return APR_SUCCESS; SSLConnRec *sslconn = myConnConfig(c);
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, NULL,
"SSL connection destroyed without being closed");
SSL_free(filter_ctx->pssl);
sslconn->ssl = filter_ctx->pssl = NULL;
} }
c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl); return APR_SUCCESS;
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");
}
return ret;
} }
/* /*