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

7 files changed, 14 insertions, 7 deletions

diff --git a/server/mpm/beos/beos.c b/server/mpm/beos/beos.c
index 3aaa1e3859..e07a7f14ba 100644
--- a/server/mpm/beos/beos.c
+++ b/server/mpm/beos/beos.c
@@ -87,6 +87,7 @@
 #include "mpm.h"
 #include "mpm_default.h"
 #include "apr_thread_mutex.h"
+#include "apr_poll.h"
 
 extern int _kset_fd_limit_(int num);
 
@@ -421,7 +422,7 @@ static int32 worker_thread(void * dummy)
             apr_int16_t event;
             apr_status_t ret;
 
-            ret = apr_poll(pollset, &srv, -1);
+            ret = apr_poll(pollset, num_listening_sockets, &srv, -1);
 
             if (ret != APR_SUCCESS) {
                 if (APR_STATUS_IS_EINTR(ret)) {
diff --git a/server/mpm/experimental/leader/leader.c b/server/mpm/experimental/leader/leader.c
index 02d55a1204..aefa44a163 100644
--- a/server/mpm/experimental/leader/leader.c
+++ b/server/mpm/experimental/leader/leader.c
@@ -106,6 +106,7 @@
 #include "ap_listen.h"
 #include "scoreboard.h" 
 #include "mpm_default.h"
+#include "apr_poll.h"
 
 #include <signal.h>
 #include <limits.h>             /* for INT_MAX */
@@ -888,7 +889,7 @@ static void *worker_thread(apr_thread_t *thd, void * dummy)
                 apr_status_t ret;
                 apr_int16_t event;
 
-                ret = apr_poll(pollset, &n, -1);
+                ret = apr_poll(pollset, num_listensocks, &n, -1);
                 if (ret != APR_SUCCESS) {
                     if (APR_STATUS_IS_EINTR(ret)) {
                         continue;
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)) {
diff --git a/server/mpm/experimental/threadpool/threadpool.c b/server/mpm/experimental/threadpool/threadpool.c
index 79e18ec414..e1e1102058 100644
--- a/server/mpm/experimental/threadpool/threadpool.c
+++ b/server/mpm/experimental/threadpool/threadpool.c
@@ -69,6 +69,7 @@
 #include "apr_file_io.h"
 #include "apr_thread_proc.h"
 #include "apr_signal.h"
+#include "apr_poll.h"
 #include "apr_thread_mutex.h"
 #include "apr_thread_cond.h"
 #include "apr_proc_mutex.h"
@@ -913,7 +914,7 @@ static void *listener_thread(apr_thread_t *thd, void * dummy)
                 apr_status_t ret;
                 apr_int16_t event;
 
-                ret = apr_poll(pollset, &n, -1);
+                ret = apr_poll(pollset, num_listensocks, &n, -1);
                 if (ret != APR_SUCCESS) {
                     if (APR_STATUS_IS_EINTR(ret)) {
                         continue;
diff --git a/server/mpm/mpmt_os2/mpmt_os2_child.c b/server/mpm/mpmt_os2/mpmt_os2_child.c
index 8fa7016306..31a7526571 100644
--- a/server/mpm/mpmt_os2/mpmt_os2_child.c
+++ b/server/mpm/mpmt_os2/mpmt_os2_child.c
@@ -73,6 +73,7 @@
 #include "ap_mpm.h"
 #include "ap_listen.h"
 #include "apr_portable.h"
+#include "apr_poll.h"
 #include "mpm_common.h"
 #include "apr_strings.h"
 #include <os2.h>
@@ -250,7 +251,7 @@ void ap_mpm_child_main(apr_pool_t *pconf)
             rv = APR_FROM_OS_ERROR(rc);
 
             if (rv == APR_SUCCESS) {
-                rv = apr_poll(pollset, &nsds, -1);
+                rv = apr_poll(pollset, num_listeners, &nsds, -1);
                 DosReleaseMutexSem(ap_mpm_accept_mutex);
             }
 
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index ec12fd8376..9c9b7f6f0f 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -89,6 +89,7 @@
 #include "mpm_common.h"
 #include "ap_listen.h"
 #include "ap_mmn.h"
+#include "apr_poll.h"
 
 #ifdef HAVE_BSTRING_H
 #include <bstring.h>		/* for IRIX, FD_SET calls bzero() */
@@ -631,7 +632,7 @@ static void child_main(int child_num_arg)
                 apr_int16_t event;
                 apr_int32_t n;
 
-                ret = apr_poll(pollset, &n, -1);
+                ret = apr_poll(pollset, num_listensocks, &n, -1);
                 if (ret != APR_SUCCESS) {
                     if (APR_STATUS_IS_EINTR(ret)) {
                         continue;
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index c9cec3f853..72d5ce7aaf 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -71,6 +71,7 @@
 #include "apr_signal.h"
 #include "apr_thread_mutex.h"
 #include "apr_proc_mutex.h"
+#include "apr_poll.h"
 #define APR_WANT_STRFUNC
 #include "apr_want.h"
 
@@ -758,7 +759,7 @@ static void *listener_thread(apr_thread_t *thd, void * dummy)
                 apr_status_t ret;
                 apr_int16_t event;
 
-                ret = apr_poll(pollset, &n, -1);
+                ret = apr_poll(pollset, num_listensocks, &n, -1);
                 if (ret != APR_SUCCESS) {
                     if (APR_STATUS_IS_EINTR(ret)) {
                         continue;