diff options
| author | Yann Ylavic <ylavic@apache.org> | 2024-06-21 11:48:12 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2024-06-21 11:48:12 +0200 |
| commit | 67c65983d5360c662a44af180181ece5f5bd628e (patch) | |
| tree | 370e2431fbcbaeac8f31b7d40f43b79e521b1a00 /include/ap_mmn.h | |
| parent | mod_proxy: Follow up to r1918438: Don't cleanup conn before running the addre... (diff) | |
| download | apache2-67c65983d5360c662a44af180181ece5f5bd628e.tar.xz apache2-67c65983d5360c662a44af180181ece5f5bd628e.zip | |
mpm_event,mod_http2,mod_status: Follow up to r1918257: CONN_STATE_ASYNC_WAITIO.
Per discussion on PR #449, have a separate state for returning the connection
to the MPM to wait for an IO (namely CONN_STATE_ASYNC_WAITIO), rather than
(ab)using CONN_STATE_PROCESSING.
This removes the need for AGAIN added in r1918257 (for now), and AP_MPMQ_CAN_AGAIN
is renamed to AP_MPMQ_CAN_WAITIO.
This is also the state that mod_status accounts for, so rename ->processing
to ->wait_io in process_score (shows as "wait-io" in mod_status and mod_lua).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1918482 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/ap_mmn.h')
| -rw-r--r-- | include/ap_mmn.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index fcf98e8908..3bc51334e7 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -723,9 +723,10 @@ * 20211221.17 (2.5.1-dev) Add ap_proxy_worker_get_name() * 20211221.18 (2.5.1-dev) Add ap_regexec_ex() * 20211221.19 (2.5.1-dev) Add AP_REG_NOTEMPTY_ATSTART - * 20211221.20 (2.5.1-dev) Add CONN_STATE_KEEPALIVE and CONN_STATE_PROCESSING - * 20211221.21 (2.5.1-dev) Add processing field struct process_score - * 20211221.22 (2.5.1-dev) Add AGAIN, AP_MPMQ_CAN_AGAIN. + * 20211221.20 (2.5.1-dev) Add CONN_STATE_ASYNC_WAITIO, CONN_STATE_KEEPALIVE + * and CONN_STATE_PROCESSING + * 20211221.21 (2.5.1-dev) Add wait_io field to struct process_score + * 20211221.22 (2.5.1-dev) Add AP_MPMQ_CAN_WAITIO */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ |