diff options
| author | Takashi Sato <takashi@apache.org> | 2014-06-27 04:17:30 +0000 |
|---|---|---|
| committer | Takashi Sato <takashi@apache.org> | 2014-06-27 04:17:30 +0000 |
| commit | 3d83bde5eff816af96487fd64a6411f241643497 (patch) | |
| tree | 5afd426e57c63efbfe6880c7f6b364f4e22f0998 /include/ap_mpm.h | |
| parent | e4738df5fe6ee92dd778878b6f6346bed4238fcb (diff) | |
| download | httpd-3d83bde5eff816af96487fd64a6411f241643497.tar.gz | |
Revert r1601943, r1602058, r1605307 (socket callback returning pollfds)
Revert r1605369 (wstunnel refactoring)
per discassion on dev@httpd.a.o thread Message-ID:
<CALK=YjN9HfThP_k_rF9iJPcUhcQk9sNOaDPxZNG+HcJNWS4ZAQ@mail.gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1605946 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/ap_mpm.h')
| -rw-r--r-- | include/ap_mpm.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/ap_mpm.h b/include/ap_mpm.h index f70865929c..d50acd95e3 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -198,7 +198,6 @@ AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result); /** @} */ typedef void (ap_mpm_callback_fn_t)(void *baton); -typedef void (ap_mpm_socket_callback_fn_t)(void *baton, const apr_pollfd_t *pfd); /* only added support in the Event MPM.... check for APR_ENOTIMPL */ AP_DECLARE(apr_status_t) ap_mpm_resume_suspended(conn_rec *c); @@ -223,7 +222,7 @@ AP_DECLARE(apr_status_t) ap_mpm_register_timed_callback(apr_time_t t, AP_DECLARE(apr_status_t) ap_mpm_register_socket_callback(apr_socket_t **s, apr_pool_t *p, int for_read, - ap_mpm_socket_callback_fn_t *cbfn, + ap_mpm_callback_fn_t *cbfn, void *baton); /** * Register a callback on the readability or writability on a group of sockets, with a timeout @@ -244,7 +243,7 @@ AP_DECLARE(apr_status_t) ap_mpm_register_socket_callback(apr_socket_t **s, AP_DECLARE(apr_status_t) ap_mpm_register_socket_callback_timeout(apr_socket_t **s, apr_pool_t *p, int for_read, - ap_mpm_socket_callback_fn_t *cbfn, + ap_mpm_callback_fn_t *cbfn, ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout); |