cvs commit: apache/src conf.h http_main.c

[Jim Jagielski]

jim         96/07/18 11:44:47

  Modified:    src       conf.h http_main.c
  Log:
  lingering close no work with A/UX and longjmp fluff
  
  Revision  Changes    Path
  1.23      +1 -0      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -C3 -r1.22 -r1.23
  *** conf.h    1996/07/17 23:20:49     1.22
  --- conf.h    1996/07/18 18:44:44     1.23
  ***************
  *** 238,243 ****
  --- 238,244 ----
    #undef USE_FLOCK_SERIALIZED_ACCEPT
    #define HAVE_SHMGET
    #define MOVEBREAK           0x4000000
  + #define NO_LINGCLOSE
    /* These are to let -Wall compile more cleanly */
    extern int strcasecmp(const char *, const char *);
    extern int strncasecmp(const char *,const char *,unsigned);
  
  
  
  1.53      +2 -2      apache/src/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_main.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -C3 -r1.52 -r1.53
  *** http_main.c       1996/07/18 18:27:16     1.52
  --- http_main.c       1996/07/18 18:44:45     1.53
  ***************
  *** 1123,1129 ****
        signal (SIGALRM, SIG_IGN);
        alarm (0);
        is_graceful=0;
  ! #ifdef NEXT
        longjmp(restart_buffer,1);
    #else
        siglongjmp(restart_buffer,1);
  --- 1123,1129 ----
        signal (SIGALRM, SIG_IGN);
        alarm (0);
        is_graceful=0;
  ! #if defined(NEXT)  || defined(USE_LONGJMP)
        longjmp(restart_buffer,1);
    #else
        siglongjmp(restart_buffer,1);
  ***************
  *** 1715,1721 ****
    
        /*
        if(scoreboard_image->global.please_exit && !count_live_servers())
  ! #ifdef NEXT
            longjmp(restart_buffer,1);
    #else
            siglongjmp(restart_buffer,1);
  --- 1715,1721 ----
    
        /*
        if(scoreboard_image->global.please_exit && !count_live_servers())
  ! #if defined(NEXT)  || defined(USE_LONGJMP)
            longjmp(restart_buffer,1);
    #else
            siglongjmp(restart_buffer,1);