diff options
| author | Stefan Eissing <icing@apache.org> | 2016-03-16 12:06:28 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2016-03-16 12:06:28 +0100 |
| commit | 9a54010ad2dd0cb37cb7516f3ec55e6a4f9fad05 (patch) | |
| tree | c2e099c6b7d023bb865a0d10788f167f01155978 /server/mpm_common.c | |
| parent | mod_http: Make sure HTTP filters are added on HTTP requests only. (diff) | |
| download | apache2-9a54010ad2dd0cb37cb7516f3ec55e6a4f9fad05.tar.xz apache2-9a54010ad2dd0cb37cb7516f3ec55e6a4f9fad05.zip | |
reverting r1735174 as http/1.1 just terminated before response
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1735216 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm_common.c')
| -rw-r--r-- | server/mpm_common.c | 56 |
1 files changed, 26 insertions, 30 deletions
diff --git a/server/mpm_common.c b/server/mpm_common.c index ed003f74a5..3fdfcddb42 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -68,9 +68,9 @@ APR_HOOK_LINK(mpm) \ APR_HOOK_LINK(mpm_query) \ APR_HOOK_LINK(mpm_register_timed_callback) \ - APR_HOOK_LINK(mpm_register_poll_callback) \ - APR_HOOK_LINK(mpm_register_poll_callback_timeout) \ - APR_HOOK_LINK(mpm_unregister_poll_callback) \ + APR_HOOK_LINK(mpm_register_socket_callback) \ + APR_HOOK_LINK(mpm_register_socket_callback_timeout) \ + APR_HOOK_LINK(mpm_unregister_socket_callback) \ APR_HOOK_LINK(mpm_get_name) \ APR_HOOK_LINK(mpm_resume_suspended) \ APR_HOOK_LINK(end_generation) \ @@ -110,15 +110,15 @@ AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_register_timed_callback, AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_resume_suspended, (conn_rec *c), (c), APR_ENOTIMPL) -AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_register_poll_callback, - (apr_array_header_t *pds, ap_mpm_callback_fn_t *cbfn, void *baton), - (pds, cbfn, baton), APR_ENOTIMPL) -AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_register_poll_callback_timeout, - (apr_array_header_t *pds, ap_mpm_callback_fn_t *cbfn, ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout), - (pds, cbfn, tofn, baton, timeout), APR_ENOTIMPL) -AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_unregister_poll_callback, - (apr_array_header_t *pds), - (pds), APR_ENOTIMPL) +AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_register_socket_callback, + (apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_callback_fn_t *cbfn, void *baton), + (s, p, for_read, cbfn, baton), APR_ENOTIMPL) +AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_register_socket_callback_timeout, + (apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_callback_fn_t *cbfn, ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout), + (s, p, for_read, cbfn, tofn, baton, timeout), APR_ENOTIMPL) +AP_IMPLEMENT_HOOK_RUN_FIRST(apr_status_t, mpm_unregister_socket_callback, + (apr_socket_t **s, apr_pool_t *p), + (s, p), APR_ENOTIMPL) AP_IMPLEMENT_HOOK_RUN_FIRST(int, output_pending, (conn_rec *c), (c), DECLINED) AP_IMPLEMENT_HOOK_RUN_FIRST(int, input_pending, @@ -557,35 +557,31 @@ void ap_core_child_status(server_rec *s, pid_t pid, pid, gen, slot, status_msg); } -AP_DECLARE(apr_status_t) ap_mpm_resume_suspended(conn_rec *c) -{ +AP_DECLARE(apr_status_t) ap_mpm_resume_suspended(conn_rec *c) { return ap_run_mpm_resume_suspended(c); } -AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback(apr_time_t t, - ap_mpm_callback_fn_t *cbfn, void *baton) +AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback(apr_time_t t, ap_mpm_callback_fn_t *cbfn, void *baton) { return ap_run_mpm_register_timed_callback(t, cbfn, baton); } - -AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback(apr_array_header_t *pds, - ap_mpm_callback_fn_t *cbfn, void *baton) +AP_DECLARE(apr_status_t) ap_mpm_register_socket_callback(apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_callback_fn_t *cbfn, void *baton) { - return ap_run_mpm_register_poll_callback(pds, cbfn, baton); + return ap_run_mpm_register_socket_callback(s, p, for_read, cbfn, baton); } - -AP_DECLARE(apr_status_t) ap_mpm_register_poll_callback_timeout( - apr_array_header_t *pds, ap_mpm_callback_fn_t *cbfn, - ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout) +AP_DECLARE(apr_status_t) ap_mpm_register_socket_callback_timeout(apr_socket_t **s, + apr_pool_t *p, + int for_read, + ap_mpm_callback_fn_t *cbfn, + ap_mpm_callback_fn_t *tofn, + void *baton, + apr_time_t timeout) { - return ap_run_mpm_register_poll_callback_timeout(pds, cbfn, tofn, baton, - timeout); + return ap_run_mpm_register_socket_callback_timeout(s, p, for_read, cbfn, tofn, baton, timeout); } - -AP_DECLARE(apr_status_t) ap_mpm_unregister_poll_callback( - apr_array_header_t *pds) +AP_DECLARE(apr_status_t) ap_mpm_unregister_socket_callback(apr_socket_t **s, apr_pool_t *p) { - return ap_run_mpm_unregister_poll_callback(pds); + return ap_run_mpm_unregister_socket_callback(s, p); } AP_DECLARE(const char *)ap_show_mpm(void) |