You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Rob Hartill <ha...@hyperreal.com> on 1996/02/26 18:28:23 UTC
MachTen port again (fwd)
I'll ack this one.
Forwarded message:
> From camk@homer.spub.ksu.edu Mon Feb 26 04:23:11 1996
> From: Kelly Campbell <ca...@homer.spub.ksu.edu>
> Message-Id: <19...@homer.spub.ksu.edu>
> Subject: MachTen port again
> To: apache-bugs@apache.org
> Date: Mon, 26 Feb 1996 06:23:06 -0600 (CST)
> X-Mailer: ELM [version 2.4 PL24]
> MIME-Version: 1.0
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: 7bit
> Content-Length: 4875
>
> Hi again.
>
> I just realized that I sent the wrong patch file. While that one should
> work, I had a better one that was much more simple. Basically, I had
> to change a couple of #ifdef's in http_main.c where it was using sigsetjmp
> and siglongjmp unless NEXT was defined. MachTen on a mac needed to use those
> alternate ones also, so I changed the NEXT to NO_SIGJMP and added that into
> the conf.h file.
>
> Here's the better patch file:
>
>
> diff -cr apache_1.0.3.machten/src/Configuration apache_1.0.3/src/Configuration
> *** apache_1.0.3.machten/src/Configuration Mon Feb 26 04:02:56 1996
> --- apache_1.0.3/src/Configuration Sat Feb 17 02:42:26 1996
> ***************
> *** 49,55 ****
> # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN.
>
> # For SunOS 4
> ! #AUX_CFLAGS= -DSUNOS4
> # For Solaris 2.
> #AUX_CFLAGS= -DSOLARIS2
> #AUX_LIBS= -lsocket -lnsl
> --- 49,55 ----
> # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN.
>
> # For SunOS 4
> ! AUX_CFLAGS= -DSUNOS4
> # For Solaris 2.
> #AUX_CFLAGS= -DSOLARIS2
> #AUX_LIBS= -lsocket -lnsl
> ***************
> *** 66,72 ****
> # For DEC OSF/1
> #AUX_CFLAGS= -DOSF1
> # For NeXT
> ! #AUX_CFLAGS= -DNEXT -DNO_SIGJMP
> # For Sequent
> #AUX_CFLAGS= -DSEQUENT
> # For Linux -m486 ONLY IF YOU HAVE 486 BINARY SUPPORT IN KERNEL
> --- 66,72 ----
> # For DEC OSF/1
> #AUX_CFLAGS= -DOSF1
> # For NeXT
> ! #AUX_CFLAGS= -DNEXT
> # For Sequent
> #AUX_CFLAGS= -DSEQUENT
> # For Linux -m486 ONLY IF YOU HAVE 486 BINARY SUPPORT IN KERNEL
> ***************
> *** 107,114 ****
> # For LynxOS
> #AUX_CFLAGS= -DLYNXOS
> #EXTRA_LIBS=-lbsd -ldes -lc_p
> - # For MachTen 2.2 for Macintosh
> - AUX_CFLAGS= -DMACHTEN
>
> ################################################################
> # Module configuration
> --- 107,112 ----
> diff -cr apache_1.0.3.machten/src/conf.h apache_1.0.3/src/conf.h
> *** apache_1.0.3.machten/src/conf.h Mon Feb 26 04:25:45 1996
> --- apache_1.0.3/src/conf.h Sat Feb 17 02:35:38 1996
> ***************
> *** 266,280 ****
> #define NEED_INITGROUPS
> #define JMP_BUF jmp_buf
>
> - #elif defined(MACHTEN)
> - #undef NO_KILLPG
> - #undef NEED_STRDUP
> - #define NO_SETSID
> - #define JMP_BUF sigjmp_buf
> - #define ULTRIX_BRAIN_DEATH
> - #define NO_SIGJMP
> - #define HAS_GMTOFF
> -
> /* Unknown system - Edit these to match */
> #else
> #ifdef BSD
> --- 266,271 ----
> ***************
> *** 285,296 ****
> /* NO_KILLPG is set on systems that don't have killpg */
> #undef NO_KILLPG
> /* NO_SETSID is set on systems that don't have setsid */
> ! #define NO_SETSID
> /* NEED_STRDUP is set on stupid systems that don't have strdup. */
> #undef NEED_STRDUP
> #endif
>
> -
> /* Do we have sys/resource.h; assume that BSD does. */
> #ifndef HAVE_RESOURCE
> #ifdef BSD
> --- 276,286 ----
> /* NO_KILLPG is set on systems that don't have killpg */
> #undef NO_KILLPG
> /* NO_SETSID is set on systems that don't have setsid */
> ! #undef NO_SETSID
> /* NEED_STRDUP is set on stupid systems that don't have strdup. */
> #undef NEED_STRDUP
> #endif
>
> /* Do we have sys/resource.h; assume that BSD does. */
> #ifndef HAVE_RESOURCE
> #ifdef BSD
> diff -cr apache_1.0.3.machten/src/http_main.c apache_1.0.3/src/http_main.c
> *** apache_1.0.3.machten/src/http_main.c Mon Feb 26 02:59:02 1996
> --- apache_1.0.3/src/http_main.c Sat Feb 17 02:35:35 1996
> ***************
> *** 230,236 ****
> }
>
> if (!current_conn) {
> ! #ifdef NO_SIGJMP
> longjmp(jmpbuffer,1);
> #else
> siglongjmp(jmpbuffer,1);
> --- 230,236 ----
> }
>
> if (!current_conn) {
> ! #ifdef NEXT
> longjmp(jmpbuffer,1);
> #else
> siglongjmp(jmpbuffer,1);
> ***************
> *** 270,276 ****
> timeout_req->connection->request_in);
>
> if (!standalone) exit(0);
> ! #ifdef NO_SIGJMP
> longjmp(jmpbuffer,1);
> #else
> siglongjmp(jmpbuffer,1);
> --- 270,276 ----
> timeout_req->connection->request_in);
>
> if (!standalone) exit(0);
> ! #ifdef NEXT
> longjmp(jmpbuffer,1);
> #else
> siglongjmp(jmpbuffer,1);
> ***************
> *** 645,651 ****
> void restart() {
> signal (SIGALRM, SIG_IGN);
> alarm (0);
> ! #ifdef NO_SIGJMP
> longjmp(restart_buffer,1);
> #else
> siglongjmp(restart_buffer,1);
> --- 645,651 ----
> void restart() {
> signal (SIGALRM, SIG_IGN);
> alarm (0);
> ! #ifdef NEXT
> longjmp(restart_buffer,1);
> #else
> siglongjmp(restart_buffer,1);
> ***************
> *** 766,772 ****
> exit (1);
> }
>
> ! #ifdef NO_SIGJMP
> setjmp(jmpbuffer);
> #else
> sigsetjmp(jmpbuffer,1);
> --- 766,772 ----
> exit (1);
> }
>
> ! #ifdef NEXT
> setjmp(jmpbuffer);
> #else
> sigsetjmp(jmpbuffer,1);
> ***************
> *** 882,888 ****
>
> if (!one_process) detach();
>
> ! #ifdef NO_SIGJMP
> setjmp(restart_buffer);
> #else
> sigsetjmp(restart_buffer,1);
> --- 882,888 ----
>
> if (!one_process) detach();
>
> ! #ifdef NEXT
> setjmp(restart_buffer);
> #else
> sigsetjmp(restart_buffer,1);
>