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

Fix hung SSL handshake if a particularly long CA list is configured:

Browse Source 
* modules/ssl/ssl_engine_io.c (bio_filter_in_read): Flush pending
  output unconditionally since OpenSSL is known to not flush correctly
  at all times, and it should be cheap even in cases where it is
  unnecessary.

PR: 46952


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@788715 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2009-06-26 14:22:20 +00:00
parent b524a58d53
commit efcb56a2f4
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
modules/ssl/ssl_engine_io.c
View File

@@ -469,7 +469,6 @@ static int bio_filter_in_read(BIO *bio, char *in, int inlen)
apr_size_t inl = inlen; apr_size_t inl = inlen;
bio_filter_in_ctx_t *inctx = (bio_filter_in_ctx_t *)(bio->ptr); bio_filter_in_ctx_t *inctx = (bio_filter_in_ctx_t *)(bio->ptr);
apr_read_type_e block = inctx->block; apr_read_type_e block = inctx->block;
SSLConnRec *sslconn = myConnConfig(inctx->f->c);
inctx->rc = APR_SUCCESS; inctx->rc = APR_SUCCESS;
@@ -477,17 +476,19 @@ static int bio_filter_in_read(BIO *bio, char *in, int inlen)
if (!in) if (!in)
return 0; return 0;
/* XXX: flush here only required for SSLv2; /* In theory, OpenSSL should flush as necessary, but it is known
* OpenSSL calls BIO_flush() at the appropriate times for * not to do so correctly in some cases; see PR 46952.
* the other protocols. *
* Historically, this flush call was performed only for an SSLv2
* connection or for a proxy connection. Calling _out_flush
* should be very cheap in cases where it is unnecessary (and no
* output is buffered) so the performance impact of doing it
* unconditionally should be minimal.
*/ */
if ((SSL_version(inctx->ssl) == SSL2_VERSION) || sslconn->is_proxy) { if (bio_filter_out_flush(inctx->bio_out) < 0) {
if (bio_filter_out_flush(inctx->bio_out) < 0) { bio_filter_out_ctx_t *outctx = inctx->bio_out->ptr;
bio_filter_out_ctx_t *outctx = inctx->rc = outctx->rc;
(bio_filter_out_ctx_t *)(inctx->bio_out->ptr); return -1;
inctx->rc = outctx->rc;
return -1;
}
} }
BIO_clear_retry_flags(bio); BIO_clear_retry_flags(bio);