jim 97/02/25 13:04:46
Modified: src Configure PORTING conf.h http_main.c Log: MachTen fine tuning Revision Changes Path 1.81 +7 -2 apache/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.80 retrieving revision 1.81 diff -C3 -r1.80 -r1.81 *** Configure 1997/02/25 20:56:38 1.80 --- Configure 1997/02/25 21:04:41 1.81 *************** *** 389,396 **** DEF_WANTHSREGEX=yes ;; *powerpc-tenon-machten*) ! OS='MachTen' ! LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect" ;; *convex-v11*) OS='CONVEXOS11' --- 389,401 ---- DEF_WANTHSREGEX=yes ;; *powerpc-tenon-machten*) ! OS='MachTen PPC' ! LFLAGS="$LFLAGS -Xlstack=0x14000 -Xldelcsect" ! ;; ! *-machten*) ! OS='MachTen 68K' ! LFLAGS="$LFLAGS -stack 0x14000" ! DEF_WANTHSREGEX=yes ;; *convex-v11*) OS='CONVEXOS11' 1.4 +1 -0 apache/src/PORTING Index: PORTING =================================================================== RCS file: /export/home/cvs/apache/src/PORTING,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** PORTING 1997/01/18 19:17:20 1.3 --- PORTING 1997/02/25 21:04:42 1.4 *************** *** 211,216 **** --- 211,217 ---- USE_LONGJMP: use the longjmp() call instead of siglongjmp() + (as well as setjmp() instead of sigsetjmp()) -- 1.85 +4 -1 apache/src/conf.h Index: conf.h =================================================================== RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.84 retrieving revision 1.85 diff -C3 -r1.84 -r1.85 *** conf.h 1997/02/22 01:47:30 1.84 --- conf.h 1997/02/25 21:04:42 1.85 *************** *** 246,251 **** --- 246,252 ---- #define waitpid(a,b,c) wait4((a) == -1 ? 0 : (a),(union wait *)(b),c,NULL) typedef int pid_t; #define JMP_BUF jmp_buf + #define USE_LONGJMP #define NO_USE_SIGACTION #elif defined(LINUX) *************** *** 455,469 **** #define JMP_BUF sigjmp_buf #undef NO_KILLPG #define NO_SETSID ! #define HAS_GMTOFF #ifndef __MACHTEN_PPC__ #ifndef __MACHTEN_68K__ #define __MACHTEN_68K__ #endif #define FLOCK_SERIALIZED_ACCEPT #define NO_USE_SIGACTION #undef NEED_STRDUP #else #define FCNTL_SERIALIZED_ACCEPT #endif --- 456,472 ---- #define JMP_BUF sigjmp_buf #undef NO_KILLPG #define NO_SETSID ! #define HAVE_GMTOFF #ifndef __MACHTEN_PPC__ #ifndef __MACHTEN_68K__ #define __MACHTEN_68K__ #endif #define FLOCK_SERIALIZED_ACCEPT #define NO_USE_SIGACTION + #define USE_LONGJMP #undef NEED_STRDUP #else + #define HAVE_SHMGET #define FCNTL_SERIALIZED_ACCEPT #endif 1.125 +9 -9 apache/src/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache/src/http_main.c,v retrieving revision 1.124 retrieving revision 1.125 diff -C3 -r1.124 -r1.125 *** http_main.c 1997/02/20 03:20:18 1.124 --- http_main.c 1997/02/25 21:04:43 1.125 *************** *** 436,442 **** } if (!current_conn) { ! #if defined(NEXT) || defined(USE_LONGJMP) longjmp(jmpbuffer,1); #else siglongjmp(jmpbuffer,1); --- 436,442 ---- } if (!current_conn) { ! #if defined(USE_LONGJMP) longjmp(jmpbuffer,1); #else siglongjmp(jmpbuffer,1); *************** *** 477,483 **** bclose(timeout_req->connection->client); if (!standalone) exit(0); ! #if defined(NEXT) || defined(USE_LONGJMP) longjmp(jmpbuffer,1); #else siglongjmp(jmpbuffer,1); --- 477,483 ---- bclose(timeout_req->connection->client); if (!standalone) exit(0); ! #if defined(USE_LONGJMP) longjmp(jmpbuffer,1); #else siglongjmp(jmpbuffer,1); *************** *** 1139,1145 **** 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); --- 1139,1145 ---- static JMP_BUF wait_timeout_buf; static void longjmp_out_of_alarm (int sig) { ! #if defined(USE_LONGJMP) longjmp (wait_timeout_buf, 1); #else siglongjmp (wait_timeout_buf, 1); *************** *** 1153,1159 **** static int ntimes; #endif ! #if defined(NEXT) if (setjmp(wait_timeout_buf) != 0) { #else if (sigsetjmp(wait_timeout_buf, 1) != 0) { --- 1153,1159 ---- static int ntimes; #endif ! #if defined(USE_LONGJMP) if (setjmp(wait_timeout_buf) != 0) { #else if (sigsetjmp(wait_timeout_buf, 1) != 0) { *************** *** 1338,1344 **** signal (SIGALRM, SIG_IGN); alarm (0); is_graceful=0; ! #if defined(NEXT) || defined(USE_LONGJMP) longjmp(restart_buffer,1); #else siglongjmp(restart_buffer,1); --- 1338,1344 ---- signal (SIGALRM, SIG_IGN); alarm (0); is_graceful=0; ! #if defined(USE_LONGJMP) longjmp(restart_buffer,1); #else siglongjmp(restart_buffer,1); *************** *** 1350,1356 **** scoreboard_image->global.exit_generation=generation; is_graceful=1; update_scoreboard_global(); ! #if defined(NEXT) || defined(USE_LONGJMP) longjmp(restart_buffer,1); #else siglongjmp(restart_buffer,1); --- 1350,1356 ---- scoreboard_image->global.exit_generation=generation; is_graceful=1; update_scoreboard_global(); ! #if defined(USE_LONGJMP) longjmp(restart_buffer,1); #else siglongjmp(restart_buffer,1); *************** *** 1622,1628 **** * Setup the jump buffers so that we can return here after * a signal or a timeout (yeah, I know, same thing). */ ! #ifdef NEXT setjmp(jmpbuffer); #else sigsetjmp(jmpbuffer,1); --- 1622,1628 ---- * Setup the jump buffers so that we can return here after * a signal or a timeout (yeah, I know, same thing). */ ! #if defined(USE_LONGJMP) setjmp(jmpbuffer); #else sigsetjmp(jmpbuffer,1); *************** *** 2006,2012 **** if (!one_process) detach(); ! #ifdef NEXT setjmp(restart_buffer); #else sigsetjmp(restart_buffer,1); --- 2006,2012 ---- if (!one_process) detach(); ! #if defined(USE_LONGJMP) setjmp(restart_buffer); #else sigsetjmp(restart_buffer,1); *************** *** 2131,2137 **** /* if(scoreboard_image->global.please_exit && !count_live_servers()) ! #if defined(NEXT) || defined(USE_LONGJMP) longjmp(restart_buffer,1); #else siglongjmp(restart_buffer,1); --- 2131,2137 ---- /* if(scoreboard_image->global.please_exit && !count_live_servers()) ! #if defined(USE_LONGJMP) longjmp(restart_buffer,1); #else siglongjmp(restart_buffer,1);