summaryrefslogtreecommitdiffstats
path: root/include/ap_mpm.h
diff options
context:
space:
mode:
authorTakashi Sato <takashi@apache.org>2014-06-11 18:39:34 +0200
committerTakashi Sato <takashi@apache.org>2014-06-11 18:39:34 +0200
commit0e4cf76a64040dc0d6d0154603ca189cb32b4ae1 (patch)
tree2e7e61cbf5b1cb3088b881362befdb2f53285053 /include/ap_mpm.h
parentmod_ssl: dump SSL IO/state for the write side of the connection(s), like reads. (diff)
downloadapache2-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/ap_mpm.h')
-rw-r--r--include/ap_mpm.h5
1 files changed, 3 insertions, 2 deletions
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);