diff options
| author | Graham Leggett <minfrin@apache.org> | 2022-01-24 17:14:42 +0100 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2022-01-24 17:14:42 +0100 |
| commit | 3c6a7074916ea1b6b448e2c2c196de65f878efea (patch) | |
| tree | c4e72644badeda65792dc46a02b7480aa6aa18d8 /modules/ssl | |
| parent | mod_reqtimeout: Set socket timeout for AP_MODE_INIT. (diff) | |
| download | apache2-3c6a7074916ea1b6b448e2c2c196de65f878efea.tar.xz apache2-3c6a7074916ea1b6b448e2c2c196de65f878efea.zip | |
event: Add AP_MPM_CAN_AGAIN and AGAIN to signal to the MPM that
non blocking behaviour is requested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1897423 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/ssl')
| -rw-r--r-- | modules/ssl/mod_ssl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c index 0faed73af7..40b83a8709 100644 --- a/modules/ssl/mod_ssl.c +++ b/modules/ssl/mod_ssl.c @@ -701,15 +701,15 @@ static int ssl_hook_process_connection(conn_rec* c) */ apr_bucket_brigade* temp; - int async_mpm = 0; + int again_mpm = 0; temp = apr_brigade_create(c->pool, c->bucket_alloc); - if (ap_mpm_query(AP_MPMQ_IS_ASYNC, &async_mpm) != APR_SUCCESS) { - async_mpm = 0; + if (ap_mpm_query(AP_MPMQ_CAN_AGAIN, &again_mpm) != APR_SUCCESS) { + again_mpm = 0; } - if (async_mpm) { + if (again_mpm) { /* Take advantage of an async MPM. If we see an EAGAIN, * loop round and don't block. @@ -735,7 +735,7 @@ static int ssl_hook_process_connection(conn_rec* c) ap_log_cerror(APLOG_MARK, APLOG_DEBUG, 0, c, APLOGNO(10371) "SSL handshake in progress, continuing"); - status = OK; + status = AGAIN; } else if (rv == AP_FILTER_ERROR) { /* handshake error, but mod_ssl handled it */ |