Date: 2 May 1999 14:01:04 -0000
Message-ID: <19990502140104.29644.qmail@hyperreal.org>
From: bjh@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src/os/win32 os.h
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

bjh         99/05/02 07:01:03

  Modified:    src/main alloc.c
               src/os/bs2000 os.h
               src/os/tpf os.h
               src/os/unix os.h
               src/os/win32 os.h
  Log:
  Make OS/2 CGI kill() change a bit cleaner by defining ap_os_kill() == kill()
  on all other platforms, making it possible to remove the #ifdef from the
  code.
  
  Revision  Changes    Path
  1.112     +0 -5      apache-1.3/src/main/alloc.c
  
  Index: alloc.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/alloc.c,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- alloc.c	1999/05/01 05:15:51	1.111
  +++ alloc.c	1999/05/02 14:01:01	1.112
  @@ -2673,13 +2673,8 @@
   	if ((p->kill_how == kill_after_timeout)
   	    || (p->kill_how == kill_only_once)) {
   	    /* Subprocess may be dead already.  Only need the timeout if not. */
  -#ifdef OS2
   	    if (ap_os_kill(p->pid, SIGTERM) != -1)
   		need_timeout = 1;
  -#else
  -	    if (kill(p->pid, SIGTERM) != -1)
  -		need_timeout = 1;
  -#endif
   	}
   	else if (p->kill_how == kill_always) {
   	    kill(p->pid, SIGKILL);
  
  
  
  1.17      +1 -0      apache-1.3/src/os/bs2000/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/bs2000/os.h,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- os.h	1999/03/11 09:57:36	1.16
  +++ os.h	1999/05/02 14:01:02	1.17
  @@ -32,6 +32,7 @@
   /* Other ap_os_ routines not used by this platform */
   
   #define ap_os_is_filename_valid(f)          (1)
  +#define ap_os_kill(pid, sig)                kill(pid, sig)
   
   /* Sorry if this is ugly, but the include order doesn't allow me
    * to use request_rec here... */
  
  
  
  1.7       +1 -0      apache-1.3/src/os/tpf/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/tpf/os.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- os.h	1999/04/27 20:36:38	1.6
  +++ os.h	1999/05/02 14:01:02	1.7
  @@ -33,6 +33,7 @@
   /* Other ap_os_ routines not used by this platform */
   
   #define ap_os_is_filename_valid(f)          (1)
  +#define ap_os_kill(pid, sig)                kill(pid, sig)
   
   /* Sorry if this is ugly, but the include order doesn't allow me
    * to use request_rec here... */
  
  
  
  1.39      +1 -0      apache-1.3/src/os/unix/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/unix/os.h,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- os.h	1999/01/08 23:46:46	1.38
  +++ os.h	1999/05/02 14:01:03	1.39
  @@ -89,6 +89,7 @@
   /* Other ap_os_ routines not used by this platform */
   
   #define ap_os_is_filename_valid(f)          (1)
  +#define ap_os_kill(pid, sig)                kill(pid, sig)
   
   /*
    *  Abstraction layer for loading
  
  
  
  1.29      +3 -0      apache-1.3/src/os/win32/os.h
  
  Index: os.h
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/os/win32/os.h,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- os.h	1999/03/07 13:13:56	1.28
  +++ os.h	1999/05/02 14:01:03	1.29
  @@ -120,4 +120,7 @@
   #define ap_os_dso_sym(h,s)  GetProcAddress(h,s)
   #define ap_os_dso_error()   ""	/* for now */
   
  +/* Other ap_os_ routines not used by this platform */
  +#define ap_os_kill(pid, sig)                kill(pid, sig)
  +
   #endif   /* ! APACHE_OS_H */