From: Joe Orton <jorton@apache.org>
Date: Wed, 11 Aug 2004 13:19:24 +0000 (+0000)
Subject: * modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47bafad5fe9a7d4d09d6898945f34765fc9ab582;p=thirdparty%2Fapache%2Fhttpd.git

* modules/ssl/ssl_engine_io.c (ssl_io_input_read): Fix potential
infinite loop in ssl_io_input_getline if connection is aborted without
inctx->rc being set.

PR: 29964


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk/modules/ssl@104547 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/ssl_engine_io.c b/ssl_engine_io.c
index d48292c50e6..29e9a650f8c 100644
--- a/ssl_engine_io.c
+++ b/ssl_engine_io.c
@@ -589,6 +589,10 @@ static apr_status_t ssl_io_input_read(bio_filter_in_ctx_t *inctx,
     while (1) {
 
         if (!inctx->filter_ctx->pssl) {
+            /* Ensure a non-zero error code is returned */
+            if (inctx->rc == APR_SUCCESS) {
+                inctx->rc = APR_EGENERAL;
+            }
             break;
         }