*** apache_1.3.0/src/Configure.orig	Tue May 12 21:13:50 1998
--- apache_1.3.0/src/Configure	Fri Jul 10 22:08:31 1998
***************
*** 337,343 ****
  	;;
      *-apollo-*)
  	OS='Apollo Domain'
! 	CFLAGS="$CFLAGS -DAPOLLO"
  	;;
      *-dg-dgux*)
  	OS='DG/UX 5.4'
--- 337,343 ----
  	;;
      *-apollo-*)
  	OS='Apollo Domain'
! 	CFLAGS="$CFLAGS -DAPOLLO -D_BSD_SOURCE -A ansi -A systype,any -A runtype,any"
  	;;
      *-dg-dgux*)
  	OS='DG/UX 5.4'
*** apache_1.3.0/src/helpers/GuessOS.orig	Sun Feb 22 00:00:41 1998
--- apache_1.3.0/src/helpers/GuessOS	Fri Jul 10 22:08:32 1998
***************
*** 244,249 ****
--- 244,254 ----
  # that the existance of the /usr/apollo directory is proof
  # enough
  if [ -d /usr/apollo ]; then
+     if [ -f /usr/apollo/bin/bldt ]; then
+         VERSION=`/usr/apollo/bin/bldt | grep Domain/OS | awk '{print $4}' | sed 's/,//g'`
+ 		echo "${ISP}-apollo-${VERSION}"; exit 0;
+         exit 0
+     fi
      echo "whatever-apollo-whatever"
      exit 0
  fi
*** apache_1.3.0/src/include/conf.h.orig	Fri May 29 09:15:56 1998
--- apache_1.3.0/src/include/conf.h	Fri Jul 10 22:08:32 1998
***************
*** 576,585 ****
--- 576,601 ----
  #include <sys/types.h>
  
  #elif defined(APOLLO)
+ #undef NEED_STRERROR
+ #undef NEED_STRDUP
+ #define NEED_STRCASECMP
+ #define NEED_STRNCASECMP
+ #undef NEED_INITGROUPS
+ #undef NEED_WAITPID
  #undef HAVE_GMTOFF
+ #include <sys/time.h>
  #undef NO_KILLPG
  #undef NO_SETSID
+ #define HAVE_MMAP
+ #define USE_MMAP_SCOREBOARD
  #define HAVE_SYSLOG 1
+ #define HAVE_RESOURCE
+ #define HAVE_SYS_RESOURCE_H
+ #ifndef rlim_t
+ typedef int rlim_t;
+ #endif
+ #define USE_FLOCK_SERIALIZED_ACCEPT
+ 
  
  #elif defined(__FreeBSD__) || defined(__bsdi__)
  #if defined(__FreeBSD__)
***************
*** 852,858 ****
  #include <sys/types.h>
  #include <stdarg.h>
  
! #if !defined(NEXT) && !defined(WIN32)
  #include <dirent.h>
  #define DIR_TYPE dirent
  #elif !defined(WIN32)
--- 868,874 ----
  #include <sys/types.h>
  #include <stdarg.h>
  
! #if !defined(NEXT) && !defined(WIN32) && !defined(APOLLO)
  #include <dirent.h>
  #define DIR_TYPE dirent
  #elif !defined(WIN32)
***************
*** 900,906 ****
  #include <time.h>		/* for ctime */
  #include <signal.h>
  #include <errno.h>
! #if !defined(QNX) && !defined(CONVEXOS11) && !defined(NEXT)
  #include <memory.h>
  #endif
  
--- 916,922 ----
  #include <time.h>		/* for ctime */
  #include <signal.h>
  #include <errno.h>
! #if !defined(QNX) && !defined(CONVEXOS11) && !defined(NEXT) && !defined(APOLLO)
  #include <memory.h>
  #endif
  
***************
*** 927,932 ****
--- 943,951 ----
  #if !defined(__EMX__) && !defined(WIN32)
  /* This file is not needed for OS/2 */
  #include <sys/mman.h>
+ #ifdef APOLLO
+ #define semaphore ap_semaphore
+ #endif /* APOLLO */
  #endif
  #endif
  #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS)
*** apache_1.3.0/src/main/http_main.c.orig	Fri May 29 17:18:49 1998
--- apache_1.3.0/src/main/http_main.c	Fri Jul 10 22:08:33 1998
***************
*** 1610,1615 ****
--- 1610,1620 ----
  	m = mmap((caddr_t) 0xC0000000, &len,
  		 PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, NOFD, 0);
      }
+ #elif defined APOLLO
+ 	int dum;
+ 	dum = SCOREBOARD_SIZE;
+     m = mmap((caddr_t)0, &dum,
+ 	     PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0);
  #else
      m = mmap((caddr_t) 0, SCOREBOARD_SIZE,
  	     PROT_READ | PROT_WRITE, MAP_ANON | MAP_SHARED, -1, 0);
***************
*** 2528,2533 ****
--- 2533,2539 ----
  #elif defined(SA_RESETHAND)
  	sa.sa_flags = SA_RESETHAND;
  #endif
+ #ifndef APOLLO
  	if (sigaction(SIGSEGV, &sa, NULL) < 0)
  	    ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGSEGV)");
  #ifdef SIGBUS
***************
*** 2542,2547 ****
--- 2548,2554 ----
  	if (sigaction(SIGABRT, &sa, NULL) < 0)
  	    ap_log_error(APLOG_MARK, APLOG_WARNING, server_conf, "sigaction(SIGABRT)");
  #endif
+ #endif /* not APOLLO */
  	sa.sa_flags = 0;
      }
      sa.sa_handler = sig_term;
*** apache_1.3.0/src/modules/proxy/proxy_cache.c.orig	Sat May 30 03:20:58 1998
--- apache_1.3.0/src/modules/proxy/proxy_cache.c	Fri Jul 10 22:08:34 1998
***************
*** 64,70 ****
--- 64,72 ----
  #ifdef WIN32
  #include <sys/utime.h>
  #else
+ #ifndef APOLLO
  #include <utime.h>
+ #endif /* not APOLLO */
  #endif /* WIN32 */
  #include "multithread.h"
  #include "ap_md5.h"
***************
*** 242,248 ****
      struct stat buf;
      int fd, i;
      DIR *dir;
! #if defined(NEXT) || defined(WIN32)
      struct DIR_TYPE *ent;
  #else
      struct dirent *ent;
--- 244,250 ----
      struct stat buf;
      int fd, i;
      DIR *dir;
! #if defined(NEXT) || defined(WIN32) || defined(APOLLO)
      struct DIR_TYPE *ent;
  #else
      struct dirent *ent;
*** apache_1.3.0/src/modules/standard/mod_mime_magic.c.orig	Fri May 29 07:09:57 1998
--- apache_1.3.0/src/modules/standard/mod_mime_magic.c	Fri Jul 10 22:08:34 1998
***************
*** 130,137 ****
  #include "http_log.h"
  #include "http_protocol.h"
  
  #include <utime.h>
! 
  
  /*
   * data structures and related constants
--- 130,138 ----
  #include "http_log.h"
  #include "http_protocol.h"
  
+ #ifndef APOLLO
  #include <utime.h>
! #endif
  
  /*
   * data structures and related constants
***************
*** 1485,1493 ****
--- 1486,1496 ----
  #endif
  #ifdef    S_IFSOCK
  #ifndef __COHERENT__
+ #ifndef APOLLO
      case S_IFSOCK:
  	magic_rsl_puts(r, MIME_BINARY_UNKNOWN);
  	return DONE;
+ #endif
  #endif
  #endif
      case S_IFREG:
