cvs commit: apachen/src CHANGES
akosut 97/08/27 18:38:51 Modified:src CHANGES Log: Update CHANGES file to reflect BeOS port. Revision ChangesPath 1.424 +2 -0 apachen/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apachen/src/CHANGES,v retrieving revision 1.423 retrieving revision 1.424 diff -u -u -r1.423 -r1.424 --- CHANGES 1997/08/27 05:45:14 1.423 +++ CHANGES 1997/08/28 01:38:48 1.424 @@ -1,5 +1,7 @@ Changes with Apache 1.3a2 + *) PORT: BeOS support added [Alexei Kosut] + *) Configure no longer accepts the -make option, since it creates Makefile on the fly based on Makefile.tmpl and Configuration.
cvs commit: apachen/src/main conf.h http_main.c util.c
akosut 97/08/27 18:37:03
Modified:src Configure
src/main conf.h http_main.c util.c
Log:
Add initial (not-quite-tested) support for the BeOS.
Revision ChangesPath
1.144 +5 -0 apachen/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -u -r1.143 -r1.144
--- Configure 1997/08/27 01:12:19 1.143
+++ Configure 1997/08/28 01:36:57 1.144
@@ -480,6 +480,11 @@
MAKE="make"
DEF_WANTHSREGEX=yes
;;
+*-BeOS*)
+ OS='BeOS';
+ CFLAGS="$CFLAGS -DBEOS"
+ DEF_WANTHSREGEX=yes
+ ;;
*) # default: Catch systems we don't know about
echo Sorry, but we cannot grok \"$PLAT\"
echo uname -m
1.130 +16 -2 apachen/src/main/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -u -r1.129 -r1.130
--- conf.h1997/08/27 14:22:06 1.129
+++ conf.h1997/08/28 01:36:59 1.130
@@ -605,6 +605,20 @@
#define NEED_STRNCASECMP
#define NEED_STRDUP
+#elif defined(BEOS)
+#include
+
+#define JMP_BUF sigjmp_buf
+#define NO_WRITEV
+#define NO_KILLPG
+#define NEED_INITGROUPS
+
+/* BeOS doesn't have a couple signals... redefine to close ones*/
+#define SIGBUS SIGSEGV
+#define SIGURG SIGPIPE
+
+#define isascii(c) (!((c) & ~0177))
+
#elif defined(WIN32)
/* Put your NT stuff here - Ambarish */
@@ -756,9 +770,9 @@
#include
#include
#include
-#ifndef MPE
+#if !defined(MPE) && !defined(BEOS)
#include /* for inet_ntoa */
-#endif /* ndef MPE */
+#endif
#include
#include
#include
1.212 +7 -2 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.211
retrieving revision 1.212
diff -u -u -r1.211 -r1.212
--- http_main.c 1997/08/28 00:56:41 1.211
+++ http_main.c 1997/08/28 01:36:59 1.212
@@ -98,7 +98,7 @@
#endif
#ifdef WIN32
#include "../os/win32/getopt.h"
-#else
+#elif !defined(BEOS)
#include
#endif
@@ -1947,7 +1947,7 @@
name = ent->pw_name;
} else name = user_name;
-#ifndef __EMX__
+#ifndef __EMX__
/* OS/2 dosen't support groups. */
/* Reset `groups' attributes. */
@@ -2307,11 +2307,14 @@
exit(1);
}
one = 1;
+#ifndef BEOS
+/* BeOS does not support SO_KEEPALIVE */
if (setsockopt(s, SOL_SOCKET,SO_KEEPALIVE,(char *)&one,sizeof(int)) < 0)
{
log_unixerr("setsockopt", "(SO_KEEPALIVE)", NULL, server_conf);
exit(1);
}
#endif
+#endif
sock_disable_nagle(s);
sock_enable_linger(s);
@@ -2335,6 +2338,7 @@
*
* If no size is specified, use the kernel default.
*/
+#ifndef BEOS /* BeOS does not support SO_SNDBUF */
if (server_conf->send_buffer_size) {
if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
(char *)&server_conf->send_buffer_size, sizeof(int)) < 0) {
@@ -2344,6 +2348,7 @@
/* not a fatal error */
}
}
+#endif
#ifdef MPE
/* MPE requires CAP=PM and GETPRIVMODE to bind to ports less than 1024 */
1.68 +2 -2 apachen/src/main/util.c
Index: util.c
===
RCS file: /export/home/cvs/apachen/src/main/util.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -u -r1.67 -r1.68
--- util.c1997/07/27 03:13:31 1.67
+++ util.c1997/08/28 01:37:00 1.68
@@ -1079,8 +1079,8 @@
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
-#if defined(QNX) || defined(MPE)
-/* QNX and MPE do not appear to support supplementary groups. */
+#if defined(QNX) || defined(MPE) || defined(BEOS)
+/* QNX, MPE and BeOS do not appear to support supplementary groups. */
return 0;
#else /* ndef QNX */
gid_t groups[NGROUPS_MAX];
cvs commit: apachen/src/main http_main.c
akosut 97/08/27 17:56:45 Modified:src/main http_main.c Log: Dean's new timer scheme (http_main.c revision 1.202) seems to have broken non-shared memory-based systems, by accidentally removing a #define. Put it back. Revision ChangesPath 1.211 +1 -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.210 retrieving revision 1.211 diff -u -u -r1.210 -r1.211 --- http_main.c 1997/08/26 00:00:55 1.210 +++ http_main.c 1997/08/28 00:56:41 1.211 @@ -1301,6 +1301,7 @@ } #else +#define SCOREBOARD_FILE static scoreboard _scoreboard_image; static int scoreboard_fd;
cvs commit: apachen/src/main http_log.c
randy 97/08/27 08:51:29
Modified:src/main http_log.c
Log:
Correct lack of newline pointed out by Martin Kraemer.
Revision ChangesPath
1.29 +1 -1 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- http_log.c1997/08/27 15:49:13 1.28
+++ http_log.c1997/08/27 15:51:27 1.29
@@ -299,7 +299,7 @@
API_EXPORT(void) log_reason (const char *reason, const char *file,
request_rec *r)
{
aplog_error(APLOG_MARK, APLOG_ERR, r->server,
- "access to %s failed for %s, reason: %s\n",
+ "access to %s failed for %s, reason: %s",
file,
get_remote_host(r->connection, r->per_dir_config, REMOTE_NAME),
reason);
cvs commit: apachen/src/main http_log.c
randy 97/08/27 08:49:14
Modified:src/main http_log.c
Log:
Revision ChangesPath
1.28 +1 -0 apachen/src/main/http_log.c
Index: http_log.c
===
RCS file: /export/home/cvs/apachen/src/main/http_log.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- http_log.c1997/08/27 14:22:07 1.27
+++ http_log.c1997/08/27 15:49:13 1.28
@@ -246,6 +246,7 @@
if (s->error_log) {
fprintf(s->error_log, "[%s] %s", get_time(), errstr);
vfprintf(s->error_log, fmt, args);
+ fprintf(s->error_log, "\n");
fflush(s->error_log);
}
#ifdef HAVE_SYSLOG
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 +#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 +#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 (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 #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 @@ -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 #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 NEED_INITGROUPS #define JMP_BUF jmp_buf +#de
cvs commit: apache-devsite binbuild.sh
coar97/08/27 07:17:38 Modified:.binbuild.sh Log: Fix missing tick in sed command. Submitted by: Lars Eilebrecht <[EMAIL PROTECTED]> Revision ChangesPath 1.2 +2 -2 apache-devsite/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-devsite/binbuild.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- binbuild.sh 1997/08/23 04:42:25 1.1 +++ binbuild.sh 1997/08/27 14:17:37 1.2 @@ -14,7 +14,7 @@ #!/bin/sh # -# $Id: binbuild.sh,v 1.1 1997/08/23 04:42:25 dgaudet Exp $ +# $Id: binbuild.sh,v 1.2 1997/08/27 14:17:37 coar Exp $ # Marc Slemko ([EMAIL PROTECTED]) # # Script to make Apache binary releases. The below variables must be @@ -53,7 +53,7 @@ # system is the name of the system used to name both the binary and # the generated tarballs. GuessOS is not used because it gives # particularily nice names but because it is easy -system=`./$release/src/helpers/GuessOS | sed 's/\//_/g` || exit 1 +system=`./$release/src/helpers/GuessOS | sed 's/\//_/g'` || exit 1 cp $conf $dir/src/Configuration || exit 1 cd $dir/src || exit 1
