diff options
| author | Ryan Bloom <rbb@apache.org> | 2002-07-11 07:42:20 +0200 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2002-07-11 07:42:20 +0200 |
| commit | 2c94ecadce39c98d0718e613eff7722f98c3e16a (patch) | |
| tree | 80fc94cc03879e41289c5e5556af5c06309e0aff /server/mpm/experimental/perchild | |
| parent | mod_ext_filter: don't segfault if content-type is not set. (diff) | |
| download | apache2-2c94ecadce39c98d0718e613eff7722f98c3e16a.tar.xz apache2-2c94ecadce39c98d0718e613eff7722f98c3e16a.zip | |
Bring Apache in line with APR's new poll implementation. This isn't
optimal, because it still uses the compatibility functions to make it
work, but it does work. The next step will be to take the memory for
the pollsets under Apache's control.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96005 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/mpm/experimental/perchild')
| -rw-r--r-- | server/mpm/experimental/perchild/perchild.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/server/mpm/experimental/perchild/perchild.c b/server/mpm/experimental/perchild/perchild.c index 2d6dbf9ff5..ce58400ee2 100644 --- a/server/mpm/experimental/perchild/perchild.c +++ b/server/mpm/experimental/perchild/perchild.c @@ -95,6 +95,7 @@ #include "mpm.h" #include "scoreboard.h" #include "util_filter.h" +#include "apr_poll.h" /* ### should be APR-ized */ #include <poll.h> @@ -748,7 +749,7 @@ static void *worker_thread(apr_thread_t *thd, void *arg) while (!workers_may_exit) { apr_int16_t event; - srv = apr_poll(pollset, &n, -1); + srv = apr_poll(pollset, num_listensocks, &n, -1); if (srv != APR_SUCCESS) { if (APR_STATUS_IS_EINTR(srv)) { |