cvs commit: apachen/src/main conf.h
martin 98/01/24 17:40:57 Modified:.STATUS src CHANGES src/ap Makefile.tmpl src/main conf.h Added: src/ap ap_execve.c Log: Add function to emulate the execution of #! scripts for OS's which don't support starting them automatically (enable with #define NEED_HASHBANG_EMUL) Obtained from: tcsh-6.07.05, written by [EMAIL PROTECTED] (Peter Wemm) Revision ChangesPath 1.126 +3 -0 apachen/STATUS Index: STATUS === RCS file: /home/cvs/apachen/STATUS,v retrieving revision 1.125 retrieving revision 1.126 diff -u -u -r1.125 -r1.126 --- STATUS1998/01/24 19:30:09 1.125 +++ STATUS1998/01/25 01:40:38 1.126 @@ -129,6 +129,9 @@ * Jim's [PATCH] force Unixware to use mmap() scoreboard (before was dependent on ordering of the #defines in http_main.c) * table api cleanup +* [PORT] Add function to emulate the execution of #! scripts + for OS's which don't support starting them automatically + (enable with #define NEED_HASHBANG_EMUL) Available Patches: 1.598 +7 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /home/cvs/apachen/src/CHANGES,v retrieving revision 1.597 retrieving revision 1.598 diff -u -u -r1.597 -r1.598 --- CHANGES 1998/01/24 19:39:46 1.597 +++ CHANGES 1998/01/25 01:40:53 1.598 @@ -1,5 +1,12 @@ Changes with Apache 1.3b4 + *) PORT: Some older *nix dialects cannot automatically start scripts + which begin with a #! interpreter line (the shell starts the scripts + appropriately on these platforms). Apache now supports starting of + hashbang-scripts when the NEED_HASHBANG_EMUL define is set. + [Martin Kraemer, with code from [EMAIL PROTECTED] (Peter Wemm) + taken from tcsh] + *) typedef array_header table removed from alloc.h, folks should have been writing to use table as if it were an opaque type, but even some standard modules got this wrong. By changing the definition 1.7 +2 -1 apachen/src/ap/Makefile.tmpl Index: Makefile.tmpl === RCS file: /home/cvs/apachen/src/ap/Makefile.tmpl,v retrieving revision 1.6 retrieving revision 1.7 diff -u -u -r1.6 -r1.7 --- Makefile.tmpl 1997/12/30 15:10:42 1.6 +++ Makefile.tmpl 1998/01/25 01:40:55 1.7 @@ -6,7 +6,7 @@ LIB=libap.a -OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o +OBJS=ap_signal.o ap_slack.o ap_snprintf.o ap_strings.o ap_cpystrn.o ap_execve.o .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(SPACER) $ @@ -29,3 +29,4 @@ ap_snprintf.o: $(INCDIR)/conf.h ap_strings.o: $(INCDIR)/httpd.h ap_cpystrn.o: $(INCDIR)/httpd.h +ap_execve.o: $(INCDIR)/httpd.h 1.1 apachen/src/ap/ap_execve.c Index: ap_execve.c === /* * Copyright (c) 1995-1998 The Apache Group. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright *notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright *notice, this list of conditions and the following disclaimer in *the documentation and/or other materials provided with the *distribution. * * 3. All advertising materials mentioning features or use of this *software must display the following acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * 4. The names Apache Server and Apache Group must not be used to *endorse or promote products derived from this software without *prior written permission. For written permission, please contact *[EMAIL PROTECTED] * * 5. Redistributions of any form whatsoever must retain the following *acknowledgment: *This product includes software developed by the Apache Group *for use in the Apache HTTP server project (http://www.apache.org/). * * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE APACHE GROUP OR * ITS CONTRIBUTORS BE LIABLE FOR ANY
cvs commit: apachen/src/main conf.h
jim 98/01/23 08:19:20 Modified:src/main conf.h Log: UnixWare: force continued use of mmap scoreboard Revision ChangesPath 1.176 +1 -1 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- conf.h1998/01/23 00:36:40 1.175 +++ conf.h1998/01/23 16:19:19 1.176 @@ -485,7 +485,7 @@ #define USE_MMAP_SCOREBOARD #define USE_MMAP_FILES #define HAVE_SHMGET -#define USE_SHMGET_SCOREBOARD +#undef USE_SHMGET_SCOREBOARD /* force use of mmap() scoreboard */ #define HAVE_CRYPT_H #define HAVE_SYS_SELECT_H #define HAVE_SYS_RESOURCE_H
cvs commit: apachen/src/main conf.h http_main.c
dgaudet 98/01/21 16:00:00 Modified:src CHANGES Configure src/main conf.h http_main.c Log: Found a great cleanup patch for unixware in PR#1282. Applied it with slight modifications. This should cleanup SIGHUP, serialized accept problems, and enable syslog support. PR: 1082, 1282, 1499, 1553 Submitted by: Tom Hughes [EMAIL PROTECTED] Revision ChangesPath 1.588 +5 -2 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.587 retrieving revision 1.588 diff -u -r1.587 -r1.588 --- CHANGES 1998/01/21 23:49:02 1.587 +++ CHANGES 1998/01/21 23:59:52 1.588 @@ -1,7 +1,10 @@ Changes with Apache 1.3b4 - *) PORT: UnixWare 2.1.2 SMP appears to require USE_FCNTL_SERIALIZED_ACCEPT. - It should be safe on all versions. [Dean Gaudet] PR#1553 + *) PORT: UnixWare 2.1.2 SMP appears to require USE_FCNTL_SERIALIZED_ACCEPT, + as do various earlier versions. It should be safe on all versions. + Unixware 1.x appears to have the same SIGHUP bug as solaris does with + the slack code. A few other cleanups for Unixware. + [Tom Hughes [EMAIL PROTECTED]] PR#1082, PR#1282, PR#1499, PR#1553 *) PORT: A/UX can handle single-listen accepts without mutex locking, so we add SAFE_UNSERIALIZED_ACCEPT. [Jim Jagielski] 1.178 +4 -4 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- Configure 1998/01/21 17:12:34 1.177 +++ Configure 1998/01/21 23:59:54 1.178 @@ -428,23 +428,23 @@ *-unixware1) DEF_WANTHSREGEX=yes OS='Unixware' - CFLAGS=$CFLAGS -DSVR4 -DNO_LINGCLOSE + CFLAGS=$CFLAGS -DUW=100 LIBS=$LIBS -lsocket -lnsl -lcrypt ;; *-unixware2) DEF_WANTHSREGEX=yes OS='Unixware' - CFLAGS=$CFLAGS -DSVR4 -DNO_LINGCLOSE + CFLAGS=$CFLAGS -DUW=200 LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen ;; *-unixware211) OS='Unixware 2.1.1' - CFLAGS=$CFLAGS -DUW + CFLAGS=$CFLAGS -DUW=211 LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen ;; *-unixware212) OS='Unixware 2.1.2' - CFLAGS=$CFLAGS -DUW + CFLAGS=$CFLAGS -DUW=212 LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen DBM_LIB= ;; 1.173 +2 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- conf.h1998/01/21 23:49:06 1.172 +++ conf.h1998/01/21 23:59:56 1.173 @@ -472,7 +472,9 @@ #define HAVE_SYS_SELECT_H #define HAVE_SYS_RESOURCE_H #include sys/time.h +#if UW = 200 #define _POSIX_SOURCE +#endif #define NET_SIZE_T size_t #define HAVE_SYSLOG #define USE_FCNTL_SERIALIZED_ACCEPT 1.271 +5 -0 apachen/src/main/http_main.c Index: http_main.c === RCS file: /export/home/cvs/apachen/src/main/http_main.c,v retrieving revision 1.270 retrieving revision 1.271 diff -u -r1.270 -r1.271 --- http_main.c 1998/01/21 22:24:04 1.270 +++ http_main.c 1998/01/21 23:59:58 1.271 @@ -2499,6 +2499,11 @@ #define WORKAROUND_SOLARIS_BUG #endif +/* PR#1282 Unixware 1.x appears to have the same problem as solaris */ +#if defined (UW) UW 200 +#define WORKAROUND_SOLARIS_BUG +#endif + #ifndef WORKAROUND_SOLARIS_BUG s = ap_slack(s, AP_SLACK_HIGH);
cvs commit: apachen/src/main conf.h
dgaudet 98/01/21 13:59:30 Modified:src CHANGES src/main conf.h Log: NeXT cc pretends to be gcc but it really isn't. Work around it's inaneness. PR: 1613 Revision ChangesPath 1.575 +5 -1 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.574 retrieving revision 1.575 diff -u -r1.574 -r1.575 --- CHANGES 1998/01/21 21:54:26 1.574 +++ CHANGES 1998/01/21 21:59:27 1.575 @@ -1,7 +1,11 @@ Changes with Apache 1.3b4 + *) The NeXT cc (which is gcc hacked up) doesn't appear to support some + gcc functionality. Work around it. + [Keith Severson [EMAIL PROTECTED]] PR#1613 + *) Some linkers complain when .o files contain no functions. - [Dean Gaudet] PR#1614 + [Keith Severson [EMAIL PROTECTED]] PR#1614 *) Some const declarations in mod_imap.c that were added for debugging purposes caused some compilers heartburn without adding any 1.169 +7 -1 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- conf.h1998/01/21 19:17:36 1.168 +++ conf.h1998/01/21 21:59:29 1.169 @@ -730,8 +730,14 @@ * GNUC attributes (such as to get -Wall warnings for printf-like * functions). Only do this in gcc 2.7 or later ... it may work * on earlier stuff, but why chance it. + * + * We've since discovered that the gcc shipped with NeXT systems + * as cc is completely broken. It claims to be __GNUC__ and so + * on, but it doesn't implement half of the things that __GNUC__ + * means. In particular it's missing inline and the __attribute__ + * stuff. So we hack around it. PR#1613. -djg */ -#if !defined(__GNUC__) || __GNUC__ 2 || __GNUC_MINOR__ 7 +#if !defined(__GNUC__) || __GNUC__ 2 || __GNUC_MINOR__ 7 || defined(NEXT) #define ap_inline #define __attribute__(__x) #else
cvs commit: apachen/src/main conf.h
dgaudet 98/01/21 15:49:08 Modified:src CHANGES src/main conf.h Log: Unixware smp requires accept serialization. PR: 1553 Revision ChangesPath 1.587 +4 -1 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.586 retrieving revision 1.587 diff -u -r1.586 -r1.587 --- CHANGES 1998/01/21 23:12:02 1.586 +++ CHANGES 1998/01/21 23:49:02 1.587 @@ -1,6 +1,9 @@ Changes with Apache 1.3b4 - *) [PORT] A/UX can handle single-listen accepts without mutex + *) PORT: UnixWare 2.1.2 SMP appears to require USE_FCNTL_SERIALIZED_ACCEPT. + It should be safe on all versions. [Dean Gaudet] PR#1553 + + *) PORT: A/UX can handle single-listen accepts without mutex locking, so we add SAFE_UNSERIALIZED_ACCEPT. [Jim Jagielski] *) When die() happens we need to eat any request body if one exists. 1.172 +1 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- conf.h1998/01/21 23:12:08 1.171 +++ conf.h1998/01/21 23:49:06 1.172 @@ -475,6 +475,7 @@ #define _POSIX_SOURCE #define NET_SIZE_T size_t #define HAVE_SYSLOG +#define USE_FCNTL_SERIALIZED_ACCEPT #elif defined(DGUX) #define NO_KILLPG
cvs commit: apachen/src/main conf.h
dgaudet 97/12/18 18:16:02 Modified:src/main conf.h Log: Better glibc support for linux. PR: 1542 Reviewed by: Martin Kraemer, Jim Jagielski Revision ChangesPath 1.163 +30 -2 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.162 retrieving revision 1.163 diff -u -r1.162 -r1.163 --- conf.h1997/12/01 12:10:14 1.162 +++ conf.h1997/12/19 02:16:01 1.163 @@ -310,22 +310,50 @@ #define HAVE_SYSLOG #elif defined(LINUX) + #if LINUX 1 #include features.h + +/* libc4 systems probably still work, it probably doesn't define + * __GNU_LIBRARY__ + * libc5 systems define __GNU_LIBRARY__ == 1, but don't define __GLIBC__ + * glibc 2.x and later systems define __GNU_LIBRARY__ == 6, but list it as + * deprecated in favour of __GLIBC__; the value 6 will never be changed. + * glibc 1.x systems (i.e. redhat 4.x on sparc/alpha) should have + * __GLIBC__ 2 + * all glibc based systems need crypt.h + */ #if defined(__GNU_LIBRARY__) __GNU_LIBRARY__ 1 -/* it's a glibc host */ #include crypt.h -#define NET_SIZE_T size_t #endif + +/* glibc 2.0.0 through 2.0.4 need size_t * here, where 2.0.5 needs socklen_t * + * there's no way to discern between these two libraries. But using int should + * be portable because otherwise these libs would be hopelessly broken with + * reams of existing networking code. We'll use socklen_t * for 2.1.x and + * later. + * + * int works for all the earlier libs, and is picked up by default later. + */ +#if defined(__GLIBC__) (__GLIBC__ 2 || (__GLIBC__ == 2 __GLIBC_MINOR__ 0)) +#define NET_SIZE_T socklen_t +#endif + #define HAVE_SHMGET #define USE_MMAP_FILES #define HAVE_SYS_RESOURCE_H + +/* glibc 2.1 and later finally define rlim_t */ +#if !defined(__GLIBC__) || __GLIBC__ 2 || (__GLIBC__ == 2 __GLIBC_MINOR__ 1) typedef int rlim_t; +#endif /* flock is faster ... but hasn't been tested on 1.x systems */ #define USE_FLOCK_SERIALIZED_ACCEPT + #else #define USE_FCNTL_SERIALIZED_ACCEPT #endif + #undef HAVE_GMTOFF #undef NO_KILLPG #undef NO_SETSID
cvs commit: apachen/src/main conf.h
dgaudet 97/11/12 15:26:14 Modified:src CHANGES src/main conf.h Log: Always define SUNOS_LIB_PROTOTYPES under SUNOS. Submitted by: Ben Hyde Reviewed by: Dean Gaudet, Martin Kraemer Revision ChangesPath 1.508 +4 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.507 retrieving revision 1.508 diff -u -r1.507 -r1.508 --- CHANGES 1997/11/12 23:22:03 1.507 +++ CHANGES 1997/11/12 23:26:12 1.508 @@ -1,5 +1,9 @@ Changes with Apache 1.3b3 + *) PORT: SUNOS now always defines SUNOS_LIB_PROTOTYPES because a + recent change elsewhere left us without definitions for fgetc() + and fgets() breaking compilation. [Martin Kraemer, Ben Hyde] + *) It was necessary to distinguish between resources which are allocated in the parent, for cleanup in the parent, and resources which are allocated in each child, for cleanup in each child. 1.158 +5 -4 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.157 retrieving revision 1.158 diff -u -r1.157 -r1.158 --- conf.h1997/11/11 23:04:15 1.157 +++ conf.h1997/11/12 23:26:14 1.158 @@ -117,6 +117,7 @@ #define USE_FLOCK_SERIALIZED_ACCEPT #define NEED_DIFFTIME #define HAVE_SYSLOG +#define SUNOS_LIB_PROTOTYPES #elif defined(SOLARIS2) #undef HAVE_GMTOFF @@ -923,8 +924,8 @@ int getopt(int, char **, char *); -int strcasecmp(char *, char *); -int strncasecmp(char *, char *, int); +int strcasecmp(const char *, const char *); +int strncasecmp(const char *, const char *, int); int toupper(int); int tolower(int); @@ -945,7 +946,7 @@ void perror(char *); time_t time(time_t *); -int strftime(char *, int, char *, struct tm *); +int strftime(char *, int, const char *, struct tm *); int initgroups(char *, int); int wait3(int *, int, void *); /* Close enough for us... */ @@ -969,7 +970,7 @@ void syslog(int, char *,...); char *mktemp(char *); -long vfprintf(FILE *, char *, va_list); +long vfprintf(FILE *, const char *, va_list); #endif /* SUNOS_LIB_PROTOTYPES */
cvs commit: apachen/src/main conf.h
martin 97/11/11 15:04:16 Modified:src/main conf.h Log: Add missings prototypes for SUNOS_LIB_PROTOTYPES: fgetc(), fgets() were missing but needed by util.c Revision ChangesPath 1.157 +2 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /home/cvs/apachen/src/main/conf.h,v retrieving revision 1.156 retrieving revision 1.157 diff -u -u -r1.156 -r1.157 --- conf.h1997/11/11 19:55:25 1.156 +++ conf.h1997/11/11 23:04:15 1.157 @@ -933,6 +933,8 @@ int fputs(char *, FILE *); int fread(char *, int, int, FILE *); int fwrite(char *, int, int, FILE *); +int fgetc(FILE *); +char *fgets(char *s, int, FILE*); int fflush(FILE *); int fclose(FILE *); int ungetc(int, FILE *);
cvs commit: apachen/src/main conf.h
dgaudet 97/11/08 13:47:35 Modified:src CHANGES Configure src/main conf.h Log: Update the LynxOS port. Submitted by: Marius Groeger [EMAIL PROTECTED] Reviewed by: Dean Gaudet, Paul Sutton Revision ChangesPath 1.499 +2 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.498 retrieving revision 1.499 diff -u -r1.498 -r1.499 --- CHANGES 1997/11/08 21:42:33 1.498 +++ CHANGES 1997/11/08 21:47:32 1.499 @@ -1,5 +1,7 @@ Changes with Apache 1.3b3 + *) PORT: Update the LynxOS port. [Marius Groeger [EMAIL PROTECTED]] + *) Fix logic error when issuing a mmap() failed message with a non-zero MMAP_THRESHOLD. [David Chambers [EMAIL PROTECTED]] PR#1294 1.170 +6 -4 apachen/src/Configure Index: Configure === RCS file: /export/home/cvs/apachen/src/Configure,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- Configure 1997/11/06 21:57:37 1.169 +++ Configure 1997/11/08 21:47:33 1.170 @@ -318,10 +318,12 @@ OS='Linux' CFLAGS=$CFLAGS -DLINUX=1 ;; -*-lynx-lynxos*) - OS='LynxOS' - CFLAGS=$CFLAGS -DLYNXOS - LIBS=$LIBS -lbsd -ldes -lc_p +*-lynx-lynxos) + OS='LynxOS 2.x' + CFLAGS=$CFLAGS -D__NO_INCLUDE_WARN__ -DLYNXOS + LIBS=$LIBS -lbsd -lcrypt + LFLAGS=$LFLAGS + DEF_WANTHSREGEX=yes ;; *486-*-bsdi*) OS='BSDI w/486' 1.155 +17 -3 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.154 retrieving revision 1.155 diff -u -r1.154 -r1.155 --- conf.h1997/11/08 01:13:29 1.154 +++ conf.h1997/11/08 21:47:34 1.155 @@ -510,11 +510,25 @@ #define HAVE_SYSLOG #elif defined(LYNXOS) +#undef HAVE_GMTOFF +#define HAVE_RESOURCE +#undef HAVE_MMAP +#undef HAVE_SHMGET +#undef HAVE_CRYPT_H +#undef HAVE_SYS_SELECT_H +#define HAVE_SYS_RESOURCE_H +#undef HAVE_SNPRINTF +#undef USE_FCNTL_SERIALIZED_ACCEPT +#undef USE_FLOCK_SERIALIZED_ACCEPT +#define USE_LONGJMP +#undef NO_UNISTD_H #undef NO_KILLPG #undef NO_SETSID -#define NEED_STRCASECMP -#define NEED_STRNCASECMP -#define NEED_INITGROUPS +#undef NO_USE_SIGACTION +#undef NO_LINGCLOSE +#define HAVE_CVT +extern char *crypt(char *pw, char *salt); +typedef int rlim_t; #define HAVE_SYSLOG #elif defined(UXPDS)
cvs commit: apachen/src/main conf.h
fielding97/11/05 18:57:24 Modified:src/main conf.h Log: USE_PTHREAD_SERIALIZED_ACCEPT results in locking problems when the child that has the current lock gets killed by the parent. Restore USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2, at least until we get one of the other locking mechanisms to work reliably. Reviewed by: Dean Gaudet Revision ChangesPath 1.152 +2 -5 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.151 retrieving revision 1.152 diff -u -r1.151 -r1.152 --- conf.h1997/11/05 12:48:15 1.151 +++ conf.h1997/11/06 02:57:23 1.152 @@ -124,12 +124,9 @@ #undef NO_SETSID #define HAVE_SYS_RESOURCE_H #define bzero(a,b) memset(a,0,b) -/*#define USE_FCNTL_SERIALIZED_ACCEPT */ -/*#define USE_SYSVSEM_SERIALIZED_ACCEPT */ -#if SOLARIS2 250 +#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) \ +!defined(USE_PTHREAD_SERIALIZED_ACCEPT) #define USE_FCNTL_SERIALIZED_ACCEPT -#else -#define USE_PTHREAD_SERIALIZED_ACCEPT #endif #define NEED_UNION_SEMUN #define HAVE_MMAP
cvs commit: apachen/src/main conf.h http_main.c
dgaudet 97/11/06 02:47:03
Modified:src CHANGES
src/main conf.h http_main.c
Log:
Papa Roy said I could commit this. Fix USE_PTHREAD_SERIALIZED_ACCEPT, I
totally didn't do it right the first time.
Reviewed by: Roy Fielding
Revision ChangesPath
1.488 +3 -6 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.487
retrieving revision 1.488
diff -u -r1.487 -r1.488
--- CHANGES 1997/11/06 03:03:08 1.487
+++ CHANGES 1997/11/06 10:46:58 1.488
@@ -1,10 +1,7 @@
Changes with Apache 1.3b3
-
- *) Restored USE_FCNTL_SERIALIZED_ACCEPT as the default for Solaris2,
- since the PTHREAD mechanism was losing locks on Solaris 2.5.0.
- You can now set -DUSE_SYSVSEM_SERIALIZED_ACCEPT or
- -DUSE_PTHREAD_SERIALIZED_ACCEPT in Configuration if you want to
- test the other two methods. [Roy Fielding]
+
+ *) Solaris = 2.5 was totally broken due to a mess up using pthread
+ mutexes. [Roy Fielding, Dean Gaudet]
*) OS/2 Port updated; it should be possible to build OS/2 from the same
sources as Unix now. [Brian Havard [EMAIL PROTECTED]]
1.153 +2 -2 apachen/src/main/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- conf.h1997/11/06 02:57:23 1.152
+++ conf.h1997/11/06 10:47:00 1.153
@@ -125,8 +125,8 @@
#define HAVE_SYS_RESOURCE_H
#define bzero(a,b) memset(a,0,b)
#if !defined(USE_SYSVSEM_SERIALIZED_ACCEPT) \
-!defined(USE_PTHREAD_SERIALIZED_ACCEPT)
-#define USE_FCNTL_SERIALIZED_ACCEPT
+!defined(USE_FCNTL_SERIALIZED_ACCEPT)
+#define USE_PTHREAD_SERIALIZED_ACCEPT
#endif
#define NEED_UNION_SEMUN
#define HAVE_MMAP
1.245 +47 -3 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- http_main.c 1997/11/05 12:48:17 1.244
+++ http_main.c 1997/11/06 10:47:01 1.245
@@ -333,18 +333,33 @@
#elif defined (USE_PTHREAD_SERIALIZED_ACCEPT)
/* This code probably only works on Solaris ... but it works really fast
- * on Solaris
+ * on Solaris. Note that pthread mutexes are *NOT* released when a task
+ * dies ... the task has to free it itself. So we block signals and
+ * try to be nice about releasing the mutex.
*/
#include pthread.h
-static pthread_mutex_t *accept_mutex;
+static pthread_mutex_t *accept_mutex = (void *)(caddr_t) -1;
+static int have_accept_mutex;
+static sigset_t accept_block_mask;
+static sigset_t accept_previous_mask;
+
+static void accept_mutex_child_cleanup(void *data)
+{
+if (accept_mutex != (void *)(caddr_t)-1
+ have_accept_mutex) {
+ pthread_mutex_unlock(accept_mutex);
+}
+}
static void accept_mutex_cleanup(void)
{
-if (munmap((caddr_t) accept_mutex, sizeof(*accept_mutex))) {
+if (accept_mutex != (void *)(caddr_t)-1
+ munmap((caddr_t) accept_mutex, sizeof(*accept_mutex))) {
perror(munmap);
}
+accept_mutex = (void *)(caddr_t)-1;
}
static void accept_mutex_init(pool *p)
@@ -376,14 +391,25 @@
perror(pthread_mutex_init);
exit(1);
}
+sigfillset(accept_block_mask);
+sigdelset(accept_block_mask, SIGHUP);
+sigdelset(accept_block_mask, SIGTERM);
+sigdelset(accept_block_mask, SIGUSR1);
+register_cleanup(pconf, NULL, accept_mutex_child_cleanup,
+ accept_mutex_child_cleanup);
}
static void accept_mutex_on()
{
+if (sigprocmask(SIG_BLOCK, accept_block_mask, accept_previous_mask)) {
+ perror(sigprocmask(SIG_BLOCK));
+ exit (1);
+}
if (pthread_mutex_lock(accept_mutex)) {
perror(pthread_mutex_lock);
exit(1);
}
+have_accept_mutex = 1;
}
static void accept_mutex_off()
@@ -391,6 +417,24 @@
if (pthread_mutex_unlock(accept_mutex)) {
perror(pthread_mutex_unlock);
exit(1);
+}
+/* There is a slight race condition right here... if we were to die right
+ * now, we'd do another pthread_mutex_unlock. Now, doing that would let
+ * another process into the mutex. pthread mutexes are designed to be
+ * fast, as such they don't have protection for things like testing if
the
+ * thread owning a mutex is actually unlocking it (or even any way of
+ * testing who owns the mutex).
+ *
+ * If we were to unset have_accept_mutex
cvs commit: apachen/src/main conf.h
dgaudet 97/10/24 18:52:46
Modified:src CHANGES Configure
src/helpers GuessOS
src/main conf.h
Log:
PORT: AIX now uses USE_FCNTL_SERIALIZED_ACCEPT. PR#849
PORT: i386 AIX does not have memmove. PR#1267
PORT: HPUX now defaults to using Spencer regex. PR#482, 1246
PORT: Some versions of netbsd don't automatically define
__NetBSD__. Workaround by defining NETBSD. PR#977
PORT: Unixware 2.x requires -lgen for syslog. PR#1249
PORT: Ultrix appears to not have syslog.
PORT: Basic Gemini port (treat it like unixware212).
PORT: All SVR4 systems now use NET_SIZE_T = size_t, and
use HAVE_SHMGET.
Submitted by: various
Reviewed by: Dean Gaudet, Jim Jagielski, Martin Kraemer, Brian Behlendorf
Revision ChangesPath
1.471 +12 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.470
retrieving revision 1.471
diff -u -r1.470 -r1.471
--- CHANGES 1997/10/22 08:26:50 1.470
+++ CHANGES 1997/10/25 01:52:41 1.471
@@ -1,5 +1,17 @@
Changes with Apache 1.3b3
+ *) PORT: AIX now uses USE_FCNTL_SERIALIZED_ACCEPT. PR#849
+ PORT: i386 AIX does not have memmove. PR#1267
+ PORT: HPUX now defaults to using Spencer regex. PR#482, 1246
+ PORT: Some versions of netbsd don't automatically define
+ __NetBSD__. Workaround by defining NETBSD. PR#977
+ PORT: Unixware 2.x requires -lgen for syslog. PR#1249
+ PORT: Ultrix appears to not have syslog.
+ PORT: Basic Gemini port (treat it like unixware212).
+ PORT: All SVR4 systems now use NET_SIZE_T = size_t, and
+ use HAVE_SHMGET.
+ [various]
+
*) Various improvements in detecting config file errors (missing closing
directives for Directory, Files etc. blocks, prohibiting global
server settings in VirtualHost blocks, flagging unhandled multiple
1.163 +11 -8 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- Configure 1997/10/24 19:35:16 1.162
+++ Configure 1997/10/25 01:52:42 1.163
@@ -223,10 +223,12 @@
*-hp-hpux10.*)
OS='HP-UX 10'
CFLAGS=$CFLAGS -DHPUX10
+ DEF_WANTHSREGEX=yes
;;
*-hp-hpux*)
OS='HP-UX'
CFLAGS=$CFLAGS -DHPUX
+ DEF_WANTHSREGEX=yes
;;
*-sgi-irix64)
# Note: We'd like to see patches to compile 64-bit, but for now...
@@ -304,14 +306,15 @@
DBM_LIB=
DB_LIB=
;;
-*486-*-freebsd*|*486-*-netbsd*)
- OS='FreeBSD/NETBSD on 486'
+*-netbsd*)
+ OS='NetBSD'
+ CFLAGS=$CFLAGS -DNETBSD
LIBS=$LIBS -lcrypt
DBM_LIB=
DB_LIB=
;;
-*-freebsd*|*-netbsd*)
- OS='FreeBSD/NetBSD'
+*-freebsd*)
+ OS='FreeBSD'
LIBS=$LIBS -lcrypt
DBM_LIB=
DB_LIB=
@@ -398,17 +401,17 @@
DEF_WANTHSREGEX=yes
OS='Unixware'
CFLAGS=$CFLAGS -DSVR4 -DNO_LINGCLOSE
- LIBS=$LIBS -lsocket -lnsl -lcrypt
+ LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen
;;
*-unixware211)
OS='Unixware 2.1.1'
CFLAGS=$CFLAGS -DUW
- LIBS=$LIBS -lsocket -lnsl -lcrypt
+ LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen
;;
*-unixware212)
OS='Unixware 2.1.2'
CFLAGS=$CFLAGS -DUW
- LIBS=$LIBS -lsocket -lnsl -lcrypt
+ LIBS=$LIBS -lsocket -lnsl -lcrypt -lgen
DBM_LIB=
;;
maxion-*-sysv4*)
@@ -419,7 +422,7 @@
;;
*-sni-sysv4*)
OS='SVR4'
- CFLAGS=$CFLAGS -DSVR4 -D_XPG_IV -DHAVE_MMAP
+ CFLAGS=$CFLAGS -DSVR4 -D_XPG_IV
DEF_WANTHSREGEX=yes
LIBS=$LIBS -lsocket -lnsl -lc
;;
1.32 +5 -0 apachen/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apachen/src/helpers/GuessOS,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- GuessOS 1997/10/02 05:24:58 1.31
+++ GuessOS 1997/10/25 01:52:44 1.32
@@ -178,6 +178,11 @@
echo ${MACHINE}-whatever-sysv4; exit 0
;;
+UnixWare:5:99*:*)
+ # Gemini, beta release of next rev of unixware
+ echo ${MACHINE}-whatever-unixware212; exit 0
+ ;;
+
DYNIX/ptx:4*:*)
echo ${MACHINE}-whatever-sysv4; exit 0
;;
1.150 +6 -4 apachen/src/main/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.149
retrieving revision 1.150
cvs commit: apachen/src/main conf.h
dgaudet 97/10/05 19:56:26 Modified:src/main conf.h Log: Allow admin to easily revert from SYSVSEM to FCNTL under IRIX. Revision ChangesPath 1.144 +2 -1 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.143 retrieving revision 1.144 diff -u -r1.143 -r1.144 --- conf.h1997/10/02 05:25:00 1.143 +++ conf.h1997/10/06 02:56:24 1.144 @@ -138,8 +138,9 @@ * there's some weird conflict with non-BSD signals */ #define NO_KILLPG #undef NO_SETSID -/*#define USE_FCNTL_SERIALIZED_ACCEPT */ +#if !defined(USE_FCNTL_SERIALIZED_ACCEPT) !defined(USE_USLOCK_SERIALIZED_ACCEPT) #define USE_SYSVSEM_SERIALIZED_ACCEPT +#endif #define HAVE_SHMGET #define USE_MMAP_FILES #define HAVE_CRYPT_H
cvs commit: apachen/src/main conf.h http_main.c
dgaudet 97/10/01 22:25:05
Modified:src CHANGES Configure
src/helpers GuessOS
src/main conf.h http_main.c
Log:
Atari MINT port.
Submitted by: Jan Paul Schmidt [EMAIL PROTECTED]
Reviewed by: Dean Gaudet, Brian Behlendorf, Jim Jagielski
Revision ChangesPath
1.455 +3 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.454
retrieving revision 1.455
diff -u -r1.454 -r1.455
--- CHANGES 1997/10/02 05:10:30 1.454
+++ CHANGES 1997/10/02 05:24:53 1.455
@@ -1,5 +1,8 @@
Changes with Apache 1.3b1
+ *) PORT: Support for Atari MINT.
+ [Jan Paul Schmidt [EMAIL PROTECTED]]
+
*) When booting, apache will now detach itself from stdin, stdout,
and stderr. stderr will not be detached until after the config
files have been read so you will be able to see initial error
1.158 +6 -0 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- Configure 1997/09/26 03:05:23 1.157
+++ Configure 1997/10/02 05:24:55 1.158
@@ -163,6 +163,12 @@
OSDIR=os/unix
case $PLAT in
+*mint)
+OS=MiNT
+CFLAGS=-DMINT
+LIBS=$LIBS -lportlib -lsocket
+DEF_WANTHSREGEX=yes
+;;
*MPE/iX*)
OS='MPE/iX'
CFLAGS=$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE
1.31 +3 -0 apachen/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apachen/src/helpers/GuessOS,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- GuessOS 1997/09/16 03:59:59 1.30
+++ GuessOS 1997/10/02 05:24:58 1.31
@@ -56,6 +56,9 @@
# Now we simply scan though... In most cases, the SYSTEM info is enough
#
case ${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE} in
+MiNT:*)
+echo m68k-atari-mint; exit 0
+ ;;
A/UX:*)
echo m68k-apple-aux3; exit 0
;;
1.143 +13 -1 apachen/src/main/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- conf.h1997/09/25 01:03:20 1.142
+++ conf.h1997/10/02 05:25:00 1.143
@@ -67,7 +67,19 @@
#endif
/* Define one of these according to your system. */
-#if defined(MPE)
+#if defined(MINT)
+typedef int rlim_t;
+#define HAVE_SYS_RESOURCE_H
+#define JMP_BUF sigjmp_buf
+#define NO_LONG_DOUBLE
+#define USE_FLOCK_SERIALIZED_ACCEPT
+#define _BSD_SOURCE
+#define EAGAIN EACCESS
+int initgroups (char *, int);
+char *crypt (const char *pw, const char *salt);
+int gethostname (char *name, int namelen);
+
+#elif defined(MPE)
#include sys/times.h
#define NO_SETSID
#define NO_KILLPG
1.228 +5 -5 apachen/src/main/http_main.c
Index: http_main.c
===
RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- http_main.c 1997/10/02 05:10:33 1.227
+++ http_main.c 1997/10/02 05:25:03 1.228
@@ -117,6 +117,10 @@
#endif
+#ifdef MINT
+long _stksize = 32768;
+#endif
+
#ifdef __EMX__
/* Add MMAP style functionality to OS/2 */
#ifdef HAVE_MMAP
@@ -3808,11 +3812,7 @@
int csd, int dupped_csd,
int requests_this_child, pool *pchild)
{
-#if defined(UW)
-size_t clen;
-#else
-int clen;
-#endif
+NET_SIZE_T clen;
struct sockaddr sa_server;
struct sockaddr sa_client;
cvs commit: apachen/src/main conf.h
dgaudet 97/09/15 20:44:30 Modified:src/main conf.h Log: When you NEED_ a function, you should declare the prototype for it as well. (old patch from Martin) Submitted by: Martin Kraemer Reviewed by: Dean Gaudet Revision ChangesPath 1.140 +26 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.139 retrieving revision 1.140 diff -u -r1.139 -r1.140 --- conf.h1997/09/16 00:25:45 1.139 +++ conf.h1997/09/16 03:44:29 1.140 @@ -948,3 +948,29 @@ long vfprintf(FILE *, char *, va_list); #endif /* SUNOS_LIB_PROTOTYPES */ + +/* The assumption is that when the functions are missing, + * then there's no matching prototype available either. + * Declare what is needed exactly as the replacement routines implement it. + */ +#ifdef NEED_STRDUP +extern char *strdup (const char *str); +#endif +#ifdef NEED_STRCASECMP +extern int strcasecmp (const char *a, const char *b); +#endif +#ifdef NEED_STRNCASECMP +extern int strncasecmp (const char *a, const char *b, int n); +#endif +#ifdef NEED_INITGROUPS +extern int initgroups(const char *name, gid_t basegid); +#endif +#ifdef NEED_WAITPID +extern int waitpid(pid_t pid, int *statusp, int options); +#endif +#ifdef NEED_STRERROR +extern char *strerror (int err); +#endif +#ifdef NEED_DIFFTIME +extern double difftime(time_t time1, time_t time0); +#endif
cvs commit: apachen/src/main conf.h
pcs 97/09/14 04:53:36 Modified:src/main conf.h Log: Make sure that os.h is used for non-win32 platforms as well Revision ChangesPath 1.138 +2 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.137 retrieving revision 1.138 diff -u -r1.137 -r1.138 --- conf.h1997/09/13 23:46:28 1.137 +++ conf.h1997/09/14 11:53:35 1.138 @@ -58,6 +58,8 @@ #ifdef WIN32 #include ../os/win32/os.h +#else +#include os.h #endif #if !defined(QNX) !defined(MPE) !defined(WIN32)
cvs commit: apachen/src/main conf.h
pcs 97/09/12 01:09:10 Modified:src/main conf.h Log: Now conf.h can include os.h in Win32 builds as well. the (large) Win32 section from conf.h is now in os/win32/os.h. Revision ChangesPath 1.135 +2 -67 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- conf.h1997/09/12 07:36:34 1.134 +++ conf.h1997/09/12 08:09:09 1.135 @@ -55,9 +55,8 @@ * See README for a listing of what they mean */ -#if !defined(WIN32) + #include os.h -#endif #if !defined(QNX) !defined(MPE) !defined(WIN32) #include sys/param.h @@ -629,73 +628,9 @@ #define isascii(c) (!((c) ~0177)) #elif defined(WIN32) -/* Put your NT stuff here - Ambarish */ -/* temporarily replace crypt */ -/* char *crypt(const char *pw, const char *salt); */ -#define crypt(buf,salt) (buf) - -/* Although DIR_TYPE is dirent (see nt/readdir.h) we need direct.h for - chdir() */ -#include direct.h - -#define STATUS -#define WIN32_LEAN_AND_MEAN -#define STRICT -#define NO_UNISTD_H -#define NO_WRITEV -#define NO_SETSID -#define NO_USE_SIGACTION -#define NO_TIMES -#define NO_GETTIMEOFDAY -#define NEED_PROCESS_H -#define USE_LONGJMP -#define HAVE_MMAP -#define MULTITHREAD -#define HAVE_CANONICAL_FILENAME -typedef int uid_t; -typedef int gid_t; -typedef int pid_t; -typedef int mode_t; -typedef char * caddr_t; +/* All windows stuff is now in os/win32/os.h */ -/* -Define export types. API_EXPORT_NONSTD is a nasty hack to avoid having to declare -every configuration function as __stdcall. -*/ - -#define API_EXPORT(type)__declspec(dllexport) type __stdcall -#define API_EXPORT_NONSTD(type)__declspec(dllexport) type -#ifdef IS_MODULE -# define API_VAR_EXPORT __declspec(dllimport) -#else -# define API_VAR_EXPORT __declspec(dllexport) -#endif -#define MODULE_VAR_EXPORT __declspec(dllexport) - -#define strcasecmp(s1, s2) stricmp(s1, s2) -#define strncasecmp(s1, s2, n) strnicmp(s1, s2, n) -#define lstat(x, y) stat(x, y) -#define S_ISLNK(m) (0) -#define S_ISREG(m) ((m _S_IFREG) == _S_IFREG) -#ifndef S_ISDIR -#define S_ISDIR(m) (((m) S_IFDIR) == S_IFDIR) -#endif -#ifndef S_ISREG -#define S_ISREG(m) (((m)(S_IFREG)) == (S_IFREG)) -#endif -#define STDIN_FILENO 0 -#define STDOUT_FILENO 1 -#define STDERR_FILENO 2 -#define JMP_BUF jmp_buf -#define sleep(t) Sleep(t*1000) -#define O_CREAT _O_CREAT -#define O_RDWR _O_RDWR -#define SIGPIPE 17 -/* Seems Windows is not a subgenius */ -#define NO_SLACK -#include stddef.h -/* Unknown system - Edit these to match */ #else #ifdef BSD #define HAVE_GMTOFF
cvs commit: apachen/src/main conf.h
akosut 97/09/09 11:36:59 Modified:src CHANGES src/main conf.h Log: Have Windows do full status reports with mod_status. PR: 1094 Reviewed by: Ben Laurie Revision ChangesPath 1.431 +3 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.430 retrieving revision 1.431 diff -u -u -r1.430 -r1.431 --- CHANGES 1997/09/09 11:06:55 1.430 +++ CHANGES 1997/09/09 18:36:53 1.431 @@ -1,5 +1,8 @@ Changes with Apache 1.3b1 + *) Windows now defaults to using full status reports with mod_status. + [Alexei Kosut, PR #1094] + *) *Really* disable all mod_rewrite operations if the engine is off. Some things (like RewriteMaps) were checked/performed even if they weren't supposed to be. [Ken Coar, PR #991] 1.131 +1 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.130 retrieving revision 1.131 diff -u -u -r1.130 -r1.131 --- conf.h1997/08/28 01:36:59 1.130 +++ conf.h1997/09/09 18:36:58 1.131 @@ -630,6 +630,7 @@ chdir() */ #include direct.h +#define STATUS #define WIN32_LEAN_AND_MEAN #define STRICT #define NO_UNISTD_H
cvs commit: apachen/src/main conf.h http_log.c
randy 97/08/27 07:22:09 Modified:src/main conf.h http_log.c Log: HAVE_SYSLOG. Added #define for most platforms erroring on the optimistic side. Revision ChangesPath 1.129 +28 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.128 retrieving revision 1.129 diff -u -r1.128 -r1.129 --- conf.h1997/08/24 18:24:03 1.128 +++ conf.h1997/08/27 14:22:06 1.129 @@ -93,6 +93,7 @@ #define NO_LINGCLOSE #define USE_FLOCK_SERIALIZED_ACCEPT #define NEED_DIFFTIME +#define HAVE_SYSLOG #elif defined(SOLARIS2) #undef HAVE_GMTOFF @@ -109,6 +110,7 @@ #define USE_MMAP_FILES #define HAVE_CRYPT_H int gethostname(char *name, int namelen); +#define HAVE_SYSLOG #elif defined(IRIX) #undef HAVE_GMTOFF @@ -125,6 +127,7 @@ #define NO_LONG_DOUBLE #define HAVE_BSTRING_H #define NO_LINGCLOSE +#define HAVE_SYSLOG #elif defined(HIUX) #define HAVE_SYS_RESOURCE_H @@ -137,6 +140,7 @@ #define JMP_BUF sigjmp_buf #define HAVE_SHMGET #define SELECT_NEEDS_CAST +#define HAVE_SYSLOG #elif defined(HPUX) || defined(HPUX10) #define HAVE_SYS_RESOURCE_H @@ -148,6 +152,7 @@ #endif #define JMP_BUF sigjmp_buf #define HAVE_SHMGET +#define HAVE_SYSLOG #ifndef HPUX10 #define SELECT_NEEDS_CAST typedef int rlim_t; @@ -162,6 +167,7 @@ #ifndef __ps2__ #define HAVE_MMAP #define USE_MMAP_FILES +#define HAVE_SYSLOG #ifndef DEFAULT_GROUP #define DEFAULT_GROUP nobody #endif @@ -184,6 +190,7 @@ #define const /* Not implemented */ #endif #define JMP_BUF sigjmp_buf +#define HAVE_SYSLOG #elif defined(OSF1) #define HAVE_GMTOFF @@ -194,6 +201,7 @@ #define USE_MMAP_FILES #define HAVE_CRYPT_H #define NO_LONG_DOUBLE +#define HAVE_SYSLOG #elif defined(PARAGON) #define HAVE_GMTOFF @@ -204,6 +212,7 @@ #define USE_MMAP_FILES #define HAVE_CRYPT_H #define NO_LONG_DOUBLE +#define HAVE_SYSLOG typedef int rlim_t; #elif defined(SEQUENT) @@ -211,6 +220,7 @@ #undef NO_KILLPG #define NO_SETSID #define NEED_STRDUP +#define HAVE_SYSLOG #define tolower(c) (isupper(c) ? tolower(c) : c) #elif defined(NEXT) @@ -271,6 +281,7 @@ #define JMP_BUF jmp_buf #define USE_LONGJMP #define NO_USE_SIGACTION +#define HAVE_SYSLOG #elif defined(LINUX) #if LINUX 1 @@ -295,6 +306,7 @@ #undef NEED_STRDUP #define JMP_BUF sigjmp_buf #include sys/time.h +#define HAVE_SYSLOG #elif defined(SCO) #undef HAVE_GMTOFF @@ -305,6 +317,7 @@ #define JMP_BUF sigjmp_buf #define SIGURG SIGUSR1 /* but note, this signal will be sent to a process group if enabled (for OOB data). It is not currently enabled. */ #include sys/time.h +#define HAVE_SYSLOG #elif defined(SCO5) @@ -316,6 +329,7 @@ #define USE_MMAP_FILES #define HAVE_SYS_RESOURCE_H #define SecureWare +#define HAVE_SYSLOG /* Although SCO 5 defines these in strings.h (note the s) they don't have consts. Sigh. */ @@ -355,6 +369,7 @@ #define MOVEBREAK0x400 #define NO_LINGCLOSE #define NO_SLACK +#define HAVE_SYSLOG #elif defined(SVR4) #define NO_KILLPG @@ -368,6 +383,7 @@ #define JMP_BUF sigjmp_buf /* A lot of SVR4 systems need this */ #define USE_FCNTL_SERIALIZED_ACCEPT +#define HAVE_SYSLOG #elif defined(UW) #define NO_LINGCLOSE @@ -388,6 +404,7 @@ #include sys/time.h #define _POSIX_SOURCE #define NET_SIZE_T size_t +#define HAVE_SYSLOG #elif defined(DGUX) #define NO_KILLPG @@ -400,6 +417,7 @@ /* A lot of SVR4 systems need this */ #define USE_FCNTL_SERIALIZED_ACCEPT #define ap_inet_addr inet_network +#define HAVE_SYSLOG #elif defined(__NetBSD__) || defined(__OpenBSD__) #define HAVE_SYS_RESOURCE_H @@ -407,6 +425,7 @@ #undef NO_KILLPG #undef NO_SETSID #define JMP_BUF sigjmp_buf +#define HAVE_SYSLOG #ifndef DEFAULT_USER #define DEFAULT_USER nobody #endif @@ -422,6 +441,7 @@ #define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 +#define HAVE_SYSLOG #define strftime(buf,bufsize,fmt,tm)ascftime(buf,fmt,tm) #include sys/types.h @@ -429,6 +449,7 @@ #undef HAVE_GMTOFF #undef NO_KILLPG #undef NO_SETSID +#define HAVE_SYSLOG #elif defined(__FreeBSD__) || defined(__bsdi__) #if defined(__FreeBSD__) @@ -452,6 +473,7 @@ typedef quad_t rlim_t; #endif #define USE_FLOCK_SERIALIZED_ACCEPT +#define HAVE_SYSLOG #elif defined(QNX) #ifndef crypt @@ -472,6 +494,7 @@ #include unix.h #define JMP_BUF sigjmp_buf #define HAVE_MMAP +#define HAVE_SYSLOG #elif defined(LYNXOS) #undef NO_KILLPG @@ -480,6 +503,7 @@ #define NEED_STRNCASECMP #define
cvs commit: apachen/src/main conf.h
jim 97/08/24 11:24:04
Modified:src CHANGES Configure
src/helpers GuessOS
src/main conf.h
Log:
Two new ports: Acorn RISCiX and Encore UMAX V
Revision ChangesPath
1.416 +4 -0 apachen/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.415
retrieving revision 1.416
diff -u -r1.415 -r1.416
--- CHANGES 1997/08/24 12:44:29 1.415
+++ CHANGES 1997/08/24 18:23:57 1.416
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) PORT: 2 new OSs added to the list of ports:
+ Encore's UMAX V: Arieh Markel [EMAIL PROTECTED]
+ Acorn RISCiX: Stephen Borrill [EMAIL PROTECTED]
+
*) Add the server version (SERVER_VERSION macro) to the server
configured and running entry in the error_log. Also build an
object file at link-time that contains the current time
1.140 +13 -0 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -r1.139 -r1.140
--- Configure 1997/08/24 16:39:59 1.139
+++ Configure 1997/08/24 18:23:58 1.140
@@ -427,6 +427,12 @@
CFLAGS=$CFLAGS -DSVR4
LIBS=$LIBS -lsocket -lnsl -lc
;;
+88k-encore-sysv4)
+ OS='Encore UMAX V'
+ CFLAGS=$CFLAGS -DSVR4 -DENCORE
+ DEF_WANTHSREGEX=yes
+ LIBS=$LIBS -lPW
+ ;;
*-uts*)
OS='Amdahl UTS'
CFLAGS=$CFLAGS -Xa -eft -DUTS21
@@ -468,6 +474,13 @@
DEF_WANTHSREGEX=yes
OS='SONY NEWS-OS'
CFLAGS=$CFLAGS -DNEWSOS
+ ;;
+*-riscix)
+ OS='Acorn RISCix'
+ CFLAGS=$CFLAGS -DRISCIX
+ OPTIM=-O
+ MAKE=make
+ DEF_WANTHSREGEX=yes
;;
*) # default: Catch systems we don't know about
echo Sorry, but we cannot grok \$PLAT\
1.28 +8 -0 apachen/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apachen/src/helpers/GuessOS,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- GuessOS 1997/07/21 23:09:31 1.27
+++ GuessOS 1997/08/24 18:24:02 1.28
@@ -167,6 +167,10 @@
echo ${MACHINE}-whatever-sysv4; exit 0
;;
+unix:3.0.9*:*:88k)
+ echo ${MACHINE}-encore-sysv4; exit 0
+ ;;
+
*:4*:R4*:m88k)
echo ${MACHINE}-whatever-sysv4; exit 0
;;
@@ -205,6 +209,10 @@
NonStop-UX:4.[02]*:[BC]*:*)
echo ${MACHINE}-tandem-sysv4; exit 0;
+ ;;
+
+RISC iX:*)
+ echo arm-whatever-riscix; exit 0;
;;
esac
1.128 +13 -1 apachen/src/main/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- conf.h1997/08/23 16:01:21 1.127
+++ conf.h1997/08/24 18:24:03 1.128
@@ -361,7 +361,9 @@
#undef NO_SETSID
#undef NEED_STRDUP
#define NEED_STRCASECMP
+#ifndef ENCORE
#define NEED_STRNCASECMP
+#endif
#define bzero(a,b) memset(a,0,b)
#define JMP_BUF sigjmp_buf
/* A lot of SVR4 systems need this */
@@ -565,6 +567,16 @@
typedef int rlim_t;
typedef int mode_t;
+#elif defined(RISCIX)
+#include sys/time.h
+#define JMP_BUF jmp_buf
+typedef int rlim_t;
+#define NO_USE_SIGACTION
+#define USE_LONGJMP
+#define NEED_STRCASECMP
+#define NEED_STRNCASECMP
+#define NEED_STRDUP
+
#elif defined(WIN32)
/* Put your NT stuff here - Ambarish */
@@ -846,7 +858,7 @@
*/
#if defined(CRAY) || defined(__arm)
-#if __STDC__
+#ifdef __STDC__
#define XtOffset(p_type,field) _Offsetof(p_type,field)
#else
#ifdef CRAY2
cvs commit: apachen/src/main conf.h httpd.h
randy 97/08/23 09:01:24 Modified:src/main conf.h httpd.h Log: Conditionalize a few more defines. Revision ChangesPath 1.127 +12 -0 apachen/src/main/conf.h Index: conf.h === RCS file: /export/home/cvs/apachen/src/main/conf.h,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- conf.h1997/08/18 10:59:03 1.126 +++ conf.h1997/08/23 16:01:21 1.127 @@ -162,9 +162,13 @@ #ifndef __ps2__ #define HAVE_MMAP #define USE_MMAP_FILES +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP nobody #endif +#endif +#ifndef DEFAULT_USER #define DEFAULT_USER nobody +#endif #ifdef NEED_RLIM_T typedef int rlim_t; #endif @@ -401,8 +405,12 @@ #undef NO_KILLPG #undef NO_SETSID #define JMP_BUF sigjmp_buf +#ifndef DEFAULT_USER #define DEFAULT_USER nobody +#endif +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP nogroup +#endif #elif defined(UTS21) #undef HAVE_GMTOFF @@ -431,8 +439,12 @@ #define JMP_BUF sigjmp_buf #define HAVE_MMAP #define USE_MMAP_FILES +#ifndef DEFAULT_USER #define DEFAULT_USER nobody +#endif +#ifndef DEFAULT_GROUP #define DEFAULT_GROUP nogroup +#endif #if defined(__bsdi__) || \ (defined(__FreeBSD_version) (__FreeBSD_version 22)) typedef quad_t rlim_t; 1.142 +2 -0 apachen/src/main/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apachen/src/main/httpd.h,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- httpd.h 1997/08/19 07:52:42 1.141 +++ httpd.h 1997/08/23 16:01:22 1.142 @@ -366,7 +366,9 @@ #define APACHE_RELEASE 103 #define SERVER_PROTOCOL HTTP/1.1 +#ifndef SERVER_SUPPORT #define SERVER_SUPPORT http://www.apache.org/; +#endif #define DECLINED -1 /* Module declines to handle */ #define DONE -2 /* Module has served the response completely
