cvs commit: apache-2.0/src/modules/mpm/mpmt_beos mpmt_beos.c

[dreid]

dreid       99/10/09 13:27:26

  Modified:    src/modules/mpm/mpmt_beos mpmt_beos.c
  Log:
  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?
  
  Revision  Changes    Path
  1.2       +3 -3      apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c
  
  Index: mpmt_beos.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/mpmt_beos/mpmt_beos.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- mpmt_beos.c       1999/10/08 19:02:33     1.1
  +++ mpmt_beos.c       1999/10/09 20:27:25     1.2
  @@ -606,11 +606,11 @@
       }
   }
   
  -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 @@
       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");