Incorporate Ben's changes to ap_listen_open in the beos mpm. Also used

the opportunity to make the setup_listeners routine the same as the other
mpm's.  If we're all doing it the same should it be in an mpm at all?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83954 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/mpmt_beos/mpmt_beos.c b/server/mpm/mpmt_beos/mpmt_beos.c
index f6044c0bd51204317f0d30f2eff1a8db1b259a94..719936c77175895916e472c1498f86508787b015 100644 (file)
--- a/server/mpm/mpmt_beos/mpmt_beos.c
+++ b/server/mpm/mpmt_beos/mpmt_beos.c
@@ -606,11 +606,11 @@ static void process_child_status(int pid, ap_wait_t status)
     }
 }
 
-static int setup_listeners(ap_context_t *pconf, server_rec *s)
+static int setup_listeners(server_rec *s)
 {
     ap_listen_rec *lr;
     int num_listeners = 0;
-    if (ap_listen_open(pconf, s->port)) {
+    if (ap_listen_open(s->process, s->port)) {
        return 0;
     }
     for (lr = ap_listeners; lr; lr = lr->next) {
@@ -1143,7 +1143,7 @@ int ap_mpm_run(ap_context_t *_pconf, ap_context_t *plog, server_rec *s)
     server_conf = s;
     port_of_death = create_port(1, "httpd_port_of_death");
 
-    if ((num_listenfds = setup_listeners(pconf, server_conf)) < 1) {
+    if ((num_listenfds = setup_listeners(server_conf)) < 1) {
         /* XXX: hey, what's the right way for the mpm to indicate a fatal error? */
         ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, s,
             "no listening sockets available, shutting down");