From 4ac2e43ee9ade48d750f00aa7aaa9e7fc1acaef4 Mon Sep 17 00:00:00 2001 From: Justin Erenkrantz Date: Thu, 3 Feb 2005 23:58:38 +0000 Subject: [PATCH] mod_ssl: fail quickly if SSL connection is aborted rather than making many doomed ap_pass_brigade calls. MFC: 125166 PR: 32699 Reviewed by: jorton, jerenkrantz, jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@151260 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ modules/ssl/ssl_engine_io.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CHANGES b/CHANGES index 97d20834e67..bd43c0417eb 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,8 @@ Changes with Apache 2.0.53 + *) mod_ssl: fail quickly if SSL connection is aborted rather than + making many doomed ap_pass_brigade calls. PR 32699. [Joe Orton] + *) Remove compiled-in upper limit on LimitRequestFieldSize. [Bill Stoddard] diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c index 974c07126f3..e12cd245cf4 100644 --- a/modules/ssl/ssl_engine_io.c +++ b/modules/ssl/ssl_engine_io.c @@ -153,6 +153,10 @@ static int bio_filter_out_flush(BIO *bio) outctx->rc = ap_pass_brigade(outctx->filter_ctx->pOutputFilter->next, outctx->bb); + /* Fail if the connection was reset: */ + if (outctx->rc == APR_SUCCESS && outctx->c->aborted) { + outctx->rc = APR_ECONNRESET; + } return (outctx->rc == APR_SUCCESS) ? 1 : -1; } -- 2.47.2