diff options
| author | Yann Ylavic <ylavic@apache.org> | 2018-07-20 17:47:16 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2018-07-20 17:47:16 +0200 |
| commit | 3fdba065dd16a9eafdf1997ba89277da195a66a9 (patch) | |
| tree | c45749677cec2e275a67178d50b0e251b120c150 /server/core.c | |
| parent | core: follow up to r1836237: core filter's tmp_flush_bb not used anymore. (diff) | |
| download | apache2-3fdba065dd16a9eafdf1997ba89277da195a66a9.tar.xz apache2-3fdba065dd16a9eafdf1997ba89277da195a66a9.zip | |
core: axe data_in_in/output_filter from conn_rec.
They were superseded by ap_filter_should_yield() and ap_run_in/output_pending()
in r1706669 and had poor semantics since then (we can't maintain pending
semantics both by filter and for the whole connection).
Register ap_filter_input_pending() as the default input_pending hook (which
seems to have been forgotten in the first place).
On the MPM event side, we don't need to flush pending output data when the
connection has just been processed, ap_filter_should_yield() is lightweight and
enough to determine whether we should really enter write completion state or go
straight to reading. ap_run_output_pending() is used only when write completion
is in place and needs to be completed before more processing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1836364 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/core.c')
| -rw-r--r-- | server/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/core.c b/server/core.c index d70acc369c..7fc2c35ec0 100644 --- a/server/core.c +++ b/server/core.c @@ -5850,8 +5850,11 @@ static void register_hooks(apr_pool_t *p) ap_hook_open_htaccess(ap_open_htaccess, NULL, NULL, APR_HOOK_REALLY_LAST); ap_hook_optional_fn_retrieve(core_optional_fn_retrieve, NULL, NULL, APR_HOOK_MIDDLE); + + ap_hook_input_pending(ap_filter_input_pending, NULL, NULL, + APR_HOOK_MIDDLE); ap_hook_output_pending(ap_filter_output_pending, NULL, NULL, - APR_HOOK_MIDDLE); + APR_HOOK_MIDDLE); /* register the core's insert_filter hook and register core-provided * filters |