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 276ee55b7b94869c57a4f0a7ed221a4754d46a71..0faed73af7921122d98dce143074b99631b566d9 100644 (file)
--- 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 c31f008f3f6eddf53ade774b8a4f3c5e9c1a6093..4bb380adec812f41fb28370217ed02ee10bdf510 100644 (file)
--- 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;