httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/mpm/spmt_os2 spmt_os2.c
Date Sun, 16 Jul 2000 07:12:44 GMT
bjh         00/07/16 00:12:43

  Modified:    src/include ap_listen.h
               src/main listen.c
               src/modules/mpm/spmt_os2 spmt_os2.c
  Log:
  OS/2: Put back creation of listeners in main thread in spmt_os2 MPM.
  
  Revision  Changes    Path
  1.16      +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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ap_listen.h	2000/07/13 16:05:07	1.15
  +++ ap_listen.h	2000/07/16 07:12:41	1.16
  @@ -73,7 +73,7 @@
   extern ap_listen_rec *ap_listeners;
   
   void ap_listen_pre_config(void);
  -#if !defined(WIN32) && !defined(PREFORK_MPM)
  +#if !defined(WIN32) && !defined(PREFORK_MPM) && !defined(SPMT_OS2_MPM)
   int ap_setup_listeners(server_rec *s);
   #else
   int ap_listen_open(process_rec *process, unsigned port);
  
  
  
  1.28      +1 -1      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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- listen.c	2000/07/13 16:05:06	1.27
  +++ listen.c	2000/07/16 07:12:41	1.28
  @@ -202,7 +202,7 @@
       ap_listeners = new;
   }
   
  -#if !defined(WIN32) && !defined(PREFORK_MPM)
  +#if !defined(WIN32) && !defined(PREFORK_MPM) && !defined(SPMT_OS2_MPM)
   static
   #endif
   int ap_listen_open(process_rec *process, unsigned port)
  
  
  
  1.56      +6 -0      apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c
  
  Index: spmt_os2.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/mpm/spmt_os2/spmt_os2.c,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- spmt_os2.c	2000/07/14 14:45:33	1.55
  +++ spmt_os2.c	2000/07/16 07:12:42	1.56
  @@ -1188,6 +1188,12 @@
       ap_server_conf = s;
       ap_log_pid(pconf, ap_pid_fname);
   
  +    if ((status = ap_listen_open(s->process, s->port)) != APR_SUCCESS) {
  +	ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ALERT, status, s,
  +		    "no listening sockets available, shutting down");
  +	return -1;
  +    }
  +
       SAFE_ACCEPT(accept_mutex_init(pconf));
   
       if (!is_graceful) {
  
  
  

Mime
View raw message