From a8e34cd7dc82eae02ff4c0b3fe9e372379a7ec07 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 6 Nov 2007 20:49:09 +0000 Subject: [PATCH] * modules/ssl/ssl_engine_io.c (ssl_io_filter_handshake): Renamed from ssl_io_filter_connect since the function performs a handshake in either client or server mode, not a "connect". No functional change. (both callers updated) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@592552 13f79535-47bb-0310-9956-ffa450edef68 --- modules/ssl/ssl_engine_io.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 65f8e7b3f1..d2860534cd 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -1017,7 +1017,10 @@ static apr_status_t ssl_io_filter_cleanup(void *data) * Adv. if conn_rec * can be accepted is we can hook this function using the * ap_hook_process_connection hook. */ -static int ssl_io_filter_connect(ssl_filter_ctx_t *filter_ctx) + +/* Perform the SSL handshake (whether in client or server mode), if + * necessary, for the given connection. */ +static int ssl_io_filter_handshake(ssl_filter_ctx_t *filter_ctx) { conn_rec *c = (conn_rec *)SSL_get_app_data(filter_ctx->pssl); SSLConnRec *sslconn = myConnConfig(c); @@ -1205,12 +1208,12 @@ static apr_status_t ssl_io_filter_input(ap_filter_t *f, inctx->mode = mode; inctx->block = block; - /* XXX: we could actually move ssl_io_filter_connect to an + /* XXX: we could actually move ssl_io_filter_handshake to an * ap_hook_process_connection but would still need to call it for * AP_MODE_INIT for protocols that may upgrade the connection * rather than have SSLEngine On configured. */ - if ((status = ssl_io_filter_connect(inctx->filter_ctx)) != APR_SUCCESS) { + if ((status = ssl_io_filter_handshake(inctx->filter_ctx)) != APR_SUCCESS) { return ssl_io_filter_error(f, bb, status); } @@ -1281,7 +1284,7 @@ static apr_status_t ssl_io_filter_output(ap_filter_t *f, inctx->mode = AP_MODE_READBYTES; inctx->block = APR_BLOCK_READ; - if ((status = ssl_io_filter_connect(filter_ctx)) != APR_SUCCESS) { + if ((status = ssl_io_filter_handshake(filter_ctx)) != APR_SUCCESS) { return ssl_io_filter_error(f, bb, status); } -- 2.40.0