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 /modules/lua | |
| 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 'modules/lua')
| -rw-r--r-- | modules/lua/lua_request.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c index f1b28da95a..6787bbfaf7 100644 --- a/modules/lua/lua_request.c +++ b/modules/lua/lua_request.c @@ -1264,8 +1264,8 @@ static int lua_ap_scoreboard_process(lua_State *L) lua_pushnumber(L, ps_record->suspended); lua_settable(L, -3); - lua_pushstring(L, "processing"); - lua_pushnumber(L, ps_record->processing); + lua_pushstring(L, "wait_io"); + lua_pushnumber(L, ps_record->wait_io); lua_settable(L, -3); lua_pushstring(L, "write_completion"); |