From: Graham Leggett <minfrin@apache.org>
Date: Mon, 24 Jan 2022 14:11:19 +0000 (+0000)
Subject: mod_ssl: Use AP_FILTER_ERROR to indicate when the SSL filter has
X-Git-Tag: 2.5.0-alpha2-ci-test-only~546
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=589cf97b76efe1f18276939c3f625b90a99ffacf;p=thirdparty%2Fapache%2Fhttpd.git

mod_ssl: Use AP_FILTER_ERROR to indicate when the SSL filter has
handled its own errors.


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

diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
index 276ee55b7b9..0faed73af79 100644
--- a/modules/ssl/mod_ssl.c
+++ b/modules/ssl/mod_ssl.c
@@ -737,7 +737,7 @@ static int ssl_hook_process_connection(conn_rec* c)
 
             	status = OK;
             }
-            else if (rv == APR_EGENERAL) {
+            else if (rv == AP_FILTER_ERROR) {
                 /* handshake error, but mod_ssl handled it */
 
                 ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(10372)
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index c31f008f3f6..4bb380adec8 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1083,7 +1083,7 @@ static apr_status_t ssl_io_filter_error(bio_filter_in_ctx_t *inctx,
             f->c->keepalive = AP_CONN_CLOSE;
             if (is_init) {
                 sslconn->non_ssl_request = NON_SSL_SEND_REQLINE;
-                return APR_EGENERAL;
+                return AP_FILTER_ERROR;
             }
             sslconn->non_ssl_request = NON_SSL_SEND_HDR_SEP;