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/mpm_common.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/mpm_common.h')
| -rw-r--r-- | include/mpm_common.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mpm_common.h b/include/mpm_common.h index f3a66eed5e..4031b51ddf 100644 --- a/include/mpm_common.h +++ b/include/mpm_common.h @@ -427,7 +427,7 @@ AP_DECLARE_HOOK(apr_status_t, mpm_register_timed_callback, * @ingroup hooks */ AP_DECLARE_HOOK(apr_status_t, mpm_register_socket_callback, - (apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_socket_callback_fn_t *cbfn, void *baton)) + (apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_callback_fn_t *cbfn, void *baton)) /* register the specified callback, with timeout * @ingroup hooks @@ -435,7 +435,7 @@ AP_DECLARE_HOOK(apr_status_t, mpm_register_socket_callback, */ AP_DECLARE_HOOK(apr_status_t, 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)) |