httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@locus.apache.org
Subject cvs commit: apache-2.0/src/main listen.c
Date Fri, 08 Sep 2000 14:59:54 GMT
gregames    00/09/08 07:59:49

  Modified:    src/modules/mpm/prefork prefork.c
               src/include ap_listen.h
               src/main listen.c
  Log:
  Change prefork to use the same listen api as the rest of the unix mpms
  (ap_setup_listeners).  This eliminates the need to force a recompile of
  listen.c when you switch to/from using prefork.
  
  Revision  Changes    Path
  1.128     +1 -1      apache-2.0/src/modules/mpm/prefork/prefork.c
  
  Index: prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/prefork/prefork.c,v
  retrieving revision 1.127
  retrieving revision 1.128
  diff -u -r1.127 -r1.128
  --- prefork.c	2000/08/23 00:01:55	1.127
  +++ prefork.c	2000/09/08 14:59:33	1.128
  @@ -1268,7 +1268,7 @@
       ap_listen_rec *lr;
       int sockdes;
   
  -    if (ap_listen_open(s->process, s->port)) {
  +    if (ap_setup_listeners(s) < 1 ) {
   	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, 0, s,
   		    "no listening sockets available, shutting down");
   	return -1;
  
  
  
  1.19      +1 -1      apache-2.0/src/include/ap_listen.h
  
  Index: ap_listen.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_listen.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ap_listen.h	2000/08/02 05:25:27	1.18
  +++ ap_listen.h	2000/09/08 14:59:42	1.19
  @@ -101,7 +101,7 @@
    * Setup all of the defaults for the listener list
    */
   void ap_listen_pre_config(void);
  -#if !defined(WIN32) && !defined(PREFORK_MPM) && !defined(SPMT_OS2_MPM)
  +#if !defined(WIN32) && !defined(SPMT_OS2_MPM)
   /**
    * Loop through the global ap_listen_rec list and create all of the required
    * sockets.  This executes the listen and bind on the sockets.
  
  
  
  1.31      +2 -2      apache-2.0/src/main/listen.c
  
  Index: listen.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/listen.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- listen.c	2000/08/02 05:26:48	1.30
  +++ listen.c	2000/09/08 14:59:46	1.31
  @@ -203,7 +203,7 @@
       ap_listeners = new;
   }
   
  -#if !defined(WIN32) && !defined(PREFORK_MPM) && !defined(SPMT_OS2_MPM)
  +#if !defined(WIN32) && !defined(SPMT_OS2_MPM)
   static
   #endif
   int ap_listen_open(process_rec *process, unsigned port)
  @@ -245,7 +245,7 @@
       return num_open ? 0 : -1;
   }
   
  -#if !defined(WIN32) && !defined(PREFORK_MPM)
  +#if !defined(WIN32)
   int ap_setup_listeners(server_rec *s)
   {
       ap_listen_rec *lr;
  
  
  

Mime
View raw message