diff options
| author | Takashi Sato <takashi@apache.org> | 2014-06-11 18:39:34 +0200 |
|---|---|---|
| committer | Takashi Sato <takashi@apache.org> | 2014-06-11 18:39:34 +0200 |
| commit | 0e4cf76a64040dc0d6d0154603ca189cb32b4ae1 (patch) | |
| tree | 2e7e61cbf5b1cb3088b881362befdb2f53285053 /include | |
| parent | mod_ssl: dump SSL IO/state for the write side of the connection(s), like reads. (diff) | |
| download | apache2-0e4cf76a64040dc0d6d0154603ca189cb32b4ae1.tar.xz apache2-0e4cf76a64040dc0d6d0154603ca189cb32b4ae1.zip | |
Socket event callback now takes pollfd.
User (e.g. mod_proxy_wstunnel) can know
which socket is ready.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1601943 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 8 | ||||
| -rw-r--r-- | include/ap_mpm.h | 5 | ||||
| -rw-r--r-- | include/mpm_common.h | 4 |
3 files changed, 11 insertions, 6 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 55cc96395d..6aaf04dc1d 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -457,14 +457,18 @@ * 20140207.6 (2.5.0-dev) Added ap_log_common(). * 20140207.7 (2.5.0-dev) Added ap_force_set_tz(). * 20140207.8 (2.5.0-dev) Added ap_shutdown_conn(). + * 20140611.0 (2.5.0-dev) Add ap_mpm_socket_callback_fn_t. + Changes 3rd argument's type of + ap_mpm_register_socket_callback and + ap_mpm_register_socket_callback_timeout. */ #define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */ #ifndef MODULE_MAGIC_NUMBER_MAJOR -#define MODULE_MAGIC_NUMBER_MAJOR 20140207 +#define MODULE_MAGIC_NUMBER_MAJOR 20140611 #endif -#define MODULE_MAGIC_NUMBER_MINOR 8 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 0 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/ap_mpm.h b/include/ap_mpm.h index d50acd95e3..facabf95e1 100644 --- a/include/ap_mpm.h +++ b/include/ap_mpm.h @@ -198,6 +198,7 @@ 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 *pdf); /* only added support in the Event MPM.... check for APR_ENOTIMPL */ AP_DECLARE(apr_status_t) ap_mpm_resume_suspended(conn_rec *c); @@ -222,7 +223,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_callback_fn_t *cbfn, + ap_mpm_socket_callback_fn_t *cbfn, void *baton); /** * Register a callback on the readability or writability on a group of sockets, with a timeout @@ -243,7 +244,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_callback_fn_t *cbfn, + ap_mpm_socket_callback_fn_t *cbfn, ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout); diff --git a/include/mpm_common.h b/include/mpm_common.h index 4031b51ddf..f3a66eed5e 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_callback_fn_t *cbfn, void *baton)) + (apr_socket_t **s, apr_pool_t *p, int for_read, ap_mpm_socket_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_callback_fn_t *cbfn, + ap_mpm_socket_callback_fn_t *cbfn, ap_mpm_callback_fn_t *tofn, void *baton, apr_time_t timeout)) |