dirkx 99/08/02 03:45:38
Modified: src Configure
src/helpers GuessOS
src/include ap_config.h
src/main util.c
src/modules/proxy proxy_cache.c
src/modules/standard mod_rewrite.h
src/support htdigest.c
Log:
Folded in "Ottati, Michael" <[EMAIL PROTECTED]> patches
for compaq/tandem. At this moment in time it is unclear if this
is just a one-off effort, or that there is some long term future.
But given the limited scope/quirks of the OS this might well be
a non issue.
Submitted by: "Ottati, Michael" <[EMAIL PROTECTED]>
Reviewed by: dirkx
PR: 4804
Revision Changes Path
1.365 +5 -0 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -r1.364 -r1.365
--- Configure 1999/07/29 22:58:10 1.364
+++ Configure 1999/08/02 10:45:29 1.365
@@ -740,6 +740,11 @@
CC='cc'
RANLIB='true'
;;
+ *-tandem-oss)
+ OS='Tandem OSS'
+ CFLAGS="-D_TANDEM_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -g"
+ CC='c89'
+ ;;
*) # default: Catch systems we don't know about
OS='Unknown and unsupported OS'
echo Sorry, but we cannot grok \"$PLAT\"
1.62 +4 -0 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- GuessOS 1999/07/30 05:14:08 1.61
+++ GuessOS 1999/08/02 10:45:30 1.62
@@ -150,6 +150,10 @@
echo "${MACHINE}-dec-osf"; exit 0
;;
+ NONSTOP_KERNEL:*:*:*)
+ echo "${MACHINE}-tandem-oss"; exit 0;
+ ;;
+
QNX:*)
if [ "$VERSION" -gt 422 ]; then
echo "${MACHINE}-qssl-qnx32"
1.265 +10 -1 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- ap_config.h 1999/07/30 20:58:56 1.264
+++ ap_config.h 1999/08/02 10:45:31 1.265
@@ -922,6 +922,12 @@
#undef offsetof
#define offsetof(s_type,field) ((size_t)&(((s_type*)0)->field))
+#elif defined(__TANDEM)
+#define NO_WRITEV
+#define NO_KILLPG
+#define NEED_INITGROUPS
+#define NO_SLACK
+
#else
/* Unknown system - Edit these to match */
#ifdef BSD
@@ -1005,8 +1011,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#ifdef __TANDEM
+#include <strings.h>
+#endif
#include "ap_ctype.h"
-#if !defined(MPE) && !defined(WIN32) && !defined(TPF)
+#if !defined(MPE) && !defined(WIN32) && !defined(TPF) && !defined(__TANDEM)
#include <sys/file.h>
#endif
#ifndef WIN32
1.168 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- util.c 1999/07/29 18:13:45 1.167
+++ util.c 1999/08/02 10:45:32 1.168
@@ -1746,7 +1746,7 @@
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
-#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) ||
defined(TPF)
+#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(_OSD_POSIX) ||
defined(TPF) || defined(__TANDEM)
/* QNX, MPE and BeOS do not appear to support supplementary groups. */
return 0;
#else /* ndef QNX */
1.62 +6 -0 apache-1.3/src/modules/proxy/proxy_cache.c
Index: proxy_cache.c
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/modules/proxy/proxy_cache.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- proxy_cache.c 1999/06/10 05:18:08 1.61
+++ proxy_cache.c 1999/08/02 10:45:33 1.62
@@ -69,6 +69,10 @@
#endif /* WIN32 */
#include "multithread.h"
#include "ap_md5.h"
+#ifdef __TANDEM
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
DEF_Explain
@@ -1140,6 +1144,8 @@
*p = '\0';
#ifdef WIN32
if (mkdir(c->filename) < 0 && errno != EEXIST)
+#elif defined(__TANDEM)
+ if (mkdir(c->filename, S_IRWXU | S_IRWXG | S_IRWXO) < 0 && errno !=
EEXIST)
#else
if (mkdir(c->filename, S_IREAD | S_IWRITE | S_IEXEC) < 0 && errno
!= EEXIST)
#endif /* WIN32 */
1.64 +1 -1 apache-1.3/src/modules/standard/mod_rewrite.h
Index: mod_rewrite.h
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- mod_rewrite.h 1999/06/09 11:13:55 1.63
+++ mod_rewrite.h 1999/08/02 10:45:35 1.64
@@ -157,7 +157,7 @@
#endif
#if !defined(USE_FCNTL) && !defined(USE_FLOCK)
#define USE_FLOCK 1
-#if !defined(MPE) && !defined(WIN32)
+#if !defined(MPE) && !defined(WIN32) && !defined(__TANDEM)
#include <sys/file.h>
#endif
#ifndef LOCK_UN
1.26 +1 -1 apache-1.3/src/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /x3/home/cvs/apache-1.3/src/support/htdigest.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- htdigest.c 1999/06/05 19:26:57 1.25
+++ htdigest.c 1999/08/02 10:45:36 1.26
@@ -70,7 +70,7 @@
#include <sys/types.h>
#include "ap.h"
#include "ap_md5.h"
-#if defined(MPE) || defined(QNX) || defined(WIN32)
+#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM)
#include <signal.h>
#else
#include <sys/signal.h>
