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

diff --git a/CHANGES b/CHANGES
index 97d20834e677fb11b9c4034a6033d0decf367bac..bd43c0417eb0e983d1d810c6e86a6f1a373e3819 100644 (file)
--- 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 974c07126f367976e8daf80981e43d4675867762..e12cd245cf45ad7d8cc676290a74a699d60e2ee5 100644 (file)
--- 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;
 }