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 <ro...@imdb.com> on 1996/04/29 20:19:31 UTC
Re: WWW Form Bug Report: "MachTen? (compatible, not problem)" on OTHER:MachTen (fwd)
I'll ack.
X-Sender: chris_riley@mailhost.hurricane.com
Message-Id: <v02130500adaaa8710c12@[199.227.51.5]>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Date: Mon, 29 Apr 1996 13:15:10 -0400
To: Rob Hartill <ro...@imdb.com>
From: chris_riley@miami.com (Chris Riley)
Subject: Re: WWW Form Bug Report: "MachTen? (compatible, not problem)" on OTHER:MachTen
>>>Please send the diffs with #ifdef's on the OS name the compiler uses,
>>>or make up something appropriate to go in "Configuration"
>>>diff -c please
>
Hi Rob, :-)
Ok, here are the diffs for these files:
-rw-r--r-- 1 sara 5966 Feb 17 03:42 Configuration.distrib
-rw-r--r-- 1 sara 11509 Feb 17 03:35 conf.h.distrib
-rw-r--r-- 1 sara 27078 Feb 17 03:35 http_main.c.distrib
-rw-r--r-- 1 sara 8743 Feb 17 03:32 rfc931.c.distrib
and the ones with the MachTen changes. I didn't make these up, but have
been using them quite successfully and it would be great to see them in the
regular distribution. 3 are short, but the
http_main has more alterations.
Thanks and let me know if I can be of help.
Chris
-----------------------------------------------
root@cane% diff -c rfc931.c rfc931.c.distrib
*** rfc931.c Mon Mar 4 18:11:30 1996
--- rfc931.c.distrib Sat Feb 17 03:32:09 1996
***************
*** 90,99 ****
#endif
#include <sys/types.h>
#ifndef ULTRIX_BRAIN_DEATH
- #ifndef __MACHTEN__
#include <sys/socket.h>
#endif
- #endif
#ifdef __bsdi__
#if _BSDI_VERSION > 199312
#include <netinet/in.h>
--- 90,97 ----
root@cane% diff -c conf.h conf.h.distrib
*** conf.h Mon Mar 4 18:00:34 1996
--- conf.h.distrib Sat Feb 17 03:35:38 1996
***************
*** 266,281 ****
#define NEED_INITGROUPS
#define JMP_BUF jmp_buf
- #elif defined(__MACHTEN__)
- #define JMP_BUF sigjmp_buf
- #undef NO_KILLPG
- #define NO_SETSID
- #define HAS_GMTOFF
- #ifndef __MACHTEN_PPC__
- #define FCNTL_SERIALIZED_ACCEPT
- #undef NEED_STRDUP
- #endif
-
/* Unknown system - Edit these to match */
#else
#ifdef BSD
--- 266,271 ----
root@cane% diff -c http_main.c http_main.c.distrib
*** http_main.c Thu Mar 7 16:23:22 1996
--- http_main.c.distrib Sat Feb 17 03:35:35 1996
***************
*** 132,141 ****
int one_process = 0;
#ifdef FCNTL_SERIALIZED_ACCEPT
- #if !defined(__MACHTEN__) || defined(__MACHTEN_PPC__)
static struct flock lock_it = { F_WRLCK, 0, 0, 0 };
static struct flock unlock_it = { F_UNLCK, 0, 0, 0 };
- #endif
static int lock_fd=-1;
--- 132,139 ----
***************
*** 163,185 ****
fprintf (stderr, "Cannot open lcok file\n");
exit (1);
}
! #if defined(__MACHTEN__) && !defined(__MACHTEN_PPC__)
! remove(lock_fname);
! #else
! unlink(lock_fname);
! #endif
}
void accept_mutex_on()
{
int ret;
- #if defined(__MACHTEN__) && !defined(__MACHTEN_PPC__)
- flock(lock_fd, LOCK_EX);
- #else
while ((ret = fcntl(lock_fd, F_SETLKW, &lock_it)) < 0 && errno == EINTR)
continue;
- #endif
if (ret < 0) {
log_unixerr("fcntl", "F_SETLKW", "Error getting accept lock. Exiting!",
--- 161,175 ----
fprintf (stderr, "Cannot open lcok file\n");
exit (1);
}
! unlink(lock_fname);
}
void accept_mutex_on()
{
int ret;
while ((ret = fcntl(lock_fd, F_SETLKW, &lock_it)) < 0 && errno == EINTR)
continue;
if (ret < 0) {
log_unixerr("fcntl", "F_SETLKW", "Error getting accept lock. Exiting!",
***************
*** 190,200 ****
void accept_mutex_off()
{
- #if defined(__MACHTEN__) && !defined(__MACHTEN_PPC__)
- if (flock(lock_fd, LOCK_UN) < 0)
- #else
if (fcntl (lock_fd, F_SETLKW, &unlock_it) < 0)
- #endif
{
log_unixerr("fcntl", "F_SETLKW", "Error freeing accept lock. Exiting!",
server_conf);
--- 180,186 ----
***************
*** 244,250 ****
}
if (!current_conn) {
! #if defined(NEXT) || (defined(__MACHTEN__) && !defined(__MACHTEN_PPC__))
longjmp(jmpbuffer,1);
#else
siglongjmp(jmpbuffer,1);
--- 230,236 ----
}
if (!current_conn) {
! #ifdef NEXT
longjmp(jmpbuffer,1);
#else
siglongjmp(jmpbuffer,1);
***************
*** 284,290 ****
timeout_req->connection->request_in);
if (!standalone) exit(0);
! #if defined(NEXT) || (defined(__MACHTEN__) && !defined(__MACHTEN_PPC__))
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);
***************
*** 427,438 ****
void cleanup_scoreboard ()
{
- #if defined(__MACHTEN__) && !defined(__MACHTEN_PPC__)
- /* remove(lock_fname); */
- remove(scoreboard_fname);
- #else
unlink (scoreboard_fname);
- #endif
}
/* Routines called to deal with the scoreboard image
--- 413,419 ----
***************
*** 664,670 ****
void restart() {
signal (SIGALRM, SIG_IGN);
alarm (0);
! #if defined(NEXT) || (defined(__MACHTEN__) && !defined(__MACHTEN_PPC__))
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);
***************
*** 679,689 ****
}
signal(SIGTERM,(void (*)())sig_term);
signal(SIGHUP,(void (*)())restart);
-
- #ifdef __MACHTEN_PPC__
- siginterrupt(SIGTERM, 1);
- siginterrupt(SIGHUP, 1);
- #endif
}
/*****************************************************************
--- 660,665 ----
***************
*** 790,796 ****
exit (1);
}
! #if defined(NEXT) || (defined(__MACHTEN__) && !defined(__MACHTEN_PPC__))
setjmp(jmpbuffer);
#else
sigsetjmp(jmpbuffer,1);
--- 766,772 ----
exit (1);
}
! #ifdef NEXT
setjmp(jmpbuffer);
#else
sigsetjmp(jmpbuffer,1);
***************
*** 906,912 ****
if (!one_process) detach();
! #if defined(NEXT) || (defined(__MACHTEN__) && !defined(__MACHTEN_PPC__))
setjmp(restart_buffer);
#else
sigsetjmp(restart_buffer,1);
--- 882,888 ----
if (!one_process) detach();
! #ifdef NEXT
setjmp(restart_buffer);
#else
sigsetjmp(restart_buffer,1);
root@cane%
root@cane%
root@cane% diff -c Configuration Configuration.distrib
*** Configuration Thu Mar 14 08:28:38 1996
--- Configuration.distrib Sat Feb 17 03: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
***************
*** 107,116 ****
# For LynxOS
#AUX_CFLAGS= -DLYNXOS
#EXTRA_LIBS=-lbsd -ldes -lc_p
- # For MachTen 68K
- AUX_LFLAGS=-stack 131072
- # For MachTen Power PC
- #AUX_LFLAGS=-Xlstack=131072
################################################################
# Module configuration
--- 107,112 ----
root@cane%
root@cane%
----- End of forwarded message from Chris Riley -----
--
Rob Hartill (robh@imdb.com)
The Internet Movie Database (IMDb) http://www.imdb.com/
...more movie info than you can poke a stick at.