diff options
| author | Graham Leggett <minfrin@apache.org> | 2022-01-24 15:11:19 +0100 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2022-01-24 15:11:19 +0100 |
| commit | 589cf97b76efe1f18276939c3f625b90a99ffacf (patch) | |
| tree | 12663ae528fad448e5e9ff012722818599a150cf /modules/ssl | |
| parent | Revert stray modification in r1897336. (diff) | |
| download | apache2-589cf97b76efe1f18276939c3f625b90a99ffacf.tar.xz apache2-589cf97b76efe1f18276939c3f625b90a99ffacf.zip | |
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
Diffstat (limited to 'modules/ssl')
| -rw-r--r-- | modules/ssl/mod_ssl.c | 2 | ||||
| -rw-r--r-- | modules/ssl/ssl_engine_io.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 276ee55b7b..0faed73af7 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 c31f008f3f..4bb380adec 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; |