httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ben Laurie <...@hyperreal.com>
Subject cvs commit: apache/src http_main.c
Date Sun, 08 Sep 1996 17:15:01 GMT
ben         96/09/08 10:15:00

  Modified:    src       http_main.c
  Log:
  Move reap_children out of the middle of wait_or_timeout stuff.
  
  Revision  Changes    Path
  1.65      +15 -15    apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -C3 -r1.64 -r1.65
  *** http_main.c	1996/09/06 18:36:08	1.64
  --- http_main.c	1996/09/08 17:14:58	1.65
  ***************
  *** 50,56 ****
     *
     */
    
  ! /* $Id: http_main.c,v 1.64 1996/09/06 18:36:08 jim Exp $ */
    
    /*
     * httpd.c: simple http daemon for answering WWW file requests
  --- 50,56 ----
     *
     */
    
  ! /* $Id: http_main.c,v 1.65 1996/09/08 17:14:58 ben Exp $ */
    
    /*
     * httpd.c: simple http daemon for answering WWW file requests
  ***************
  *** 935,954 ****
        }
    }
    
  - /* Finally, this routine is used by the caretaker process to wait for
  -  * a while...
  -  */
  - 
  - static JMP_BUF wait_timeout_buf;
  - 
  - static void longjmp_out_of_alarm (int sig) {
  - #if defined(NEXT) || defined(USE_LONGJMP)
  -     longjmp (wait_timeout_buf, 1);
  - #else
  -     siglongjmp (wait_timeout_buf, 1);
  - #endif
  - }
  - 
    #ifdef BROKEN_WAIT
    /*
    Some systems appear to fail to deliver dead children to wait() at times.
  --- 935,940 ----
  ***************
  *** 967,972 ****
  --- 953,972 ----
    	    }
        }
    #endif
  + 
  + /* Finally, this routine is used by the caretaker process to wait for
  +  * a while...
  +  */
  + 
  + static JMP_BUF wait_timeout_buf;
  + 
  + static void longjmp_out_of_alarm (int sig) {
  + #if defined(NEXT) || defined(USE_LONGJMP)
  +     longjmp (wait_timeout_buf, 1);
  + #else
  +     siglongjmp (wait_timeout_buf, 1);
  + #endif
  + }
    
    int wait_or_timeout (int *status)
    {
  
  
  

Mime
View raw message