You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by dr...@locus.apache.org on 2000/11/03 19:38:10 UTC
cvs commit: apache-1.3/src/support htdigest.c
dreid 00/11/03 10:38:10
Modified: src Configure
src/ap ap_getpass.c
src/include ap_config.h httpd.h
src/main http_main.c util.c
src/support htdigest.c
Log:
BeOS BONE is much closer to Unix than R5 was and this patch allows
Apache to build and run on BONE.
Revision Changes Path
1.407 +12 -2 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.406
retrieving revision 1.407
diff -u -r1.406 -r1.407
--- Configure 2000/11/02 21:26:54 1.406
+++ Configure 2000/11/03 18:37:49 1.407
@@ -777,8 +777,18 @@
DEF_WANTHSREGEX=yes
;;
*-BeOS*)
- OS='BeOS';
- CFLAGS="$CFLAGS -DBEOS"
+ PLATOSVER=`uname -r`
+ case "$PLATOSVER" in
+ 5.1*)
+ OS="BeOS BONE"
+ LIBS="-lbind -lsocket -lbe -lroot"
+ CFLAGS="$CFLAGS -DBONE"
+ ;;
+ *)
+ OS='BeOS';
+ CFLAGS="$CFLAGS -DBEOS"
+ ;;
+ esac
DEF_WANTHSREGEX=yes
;;
4850-*.*)
1.6 +1 -1 apache-1.3/src/ap/ap_getpass.c
Index: ap_getpass.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/ap/ap_getpass.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ap_getpass.c 2000/01/30 03:15:41 1.5
+++ ap_getpass.c 2000/11/03 18:37:51 1.6
@@ -84,7 +84,7 @@
#define ERR_OVERFLOW 5
-#if defined(MPE) || defined(BEOS)
+#if defined(MPE) || defined(BEOS) || defined(BONE)
#include <termios.h>
char *
1.295 +6 -0 apache-1.3/src/include/ap_config.h
Index: ap_config.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/ap_config.h,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -r1.294 -r1.295
--- ap_config.h 2000/10/07 16:08:09 1.294
+++ ap_config.h 2000/11/03 18:37:54 1.295
@@ -906,6 +906,12 @@
#define PF_INET AF_INET
#define S_IEXEC S_IXUSR
+#elif defined(BONE)
+#define NO_KILLPG
+#define NEED_INITGROUPS
+#define PF_INET AF_INET
+#define S_IEXEC S_IXUSR
+
#elif defined(_CX_SX)
#define JMP_BUF sigjmp_buf
#include <sys/types.h>
1.325 +1 -1 apache-1.3/src/include/httpd.h
Index: httpd.h
===================================================================
RCS file: /home/cvs/apache-1.3/src/include/httpd.h,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- httpd.h 2000/10/19 04:02:56 1.324
+++ httpd.h 2000/11/03 18:37:54 1.325
@@ -85,7 +85,7 @@
#elif defined(WIN32)
/* Set default for Windows file system */
#define HTTPD_ROOT "/apache"
-#elif defined(BEOS)
+#elif defined(BEOS) || defined(BONE)
#define HTTPD_ROOT "/boot/home/apache"
#elif defined(NETWARE)
#define HTTPD_ROOT "sys:/apache"
1.511 +1 -1 apache-1.3/src/main/http_main.c
Index: http_main.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
retrieving revision 1.510
retrieving revision 1.511
diff -u -r1.510 -r1.511
--- http_main.c 2000/09/28 13:32:36 1.510
+++ http_main.c 2000/11/03 18:37:59 1.511
@@ -3107,7 +3107,7 @@
static void set_group_privs(void)
{
-#if !defined(WIN32) && !defined(NETWARE) && !defined(BEOS)
+#if !defined(WIN32) && !defined(NETWARE) && !defined(BEOS) && !defined(BONE)
if (!geteuid()) {
char *name;
1.189 +1 -1 apache-1.3/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/main/util.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- util.c 2000/10/03 16:39:40 1.188
+++ util.c 2000/11/03 18:38:00 1.189
@@ -1839,7 +1839,7 @@
#ifdef NEED_INITGROUPS
int initgroups(const char *name, gid_t basegid)
{
-#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(TPF) || defined(__TANDEM) || defined(NETWARE)
+#if defined(QNX) || defined(MPE) || defined(BEOS) || defined(TPF) || defined(__TANDEM) || defined(NETWARE) || defined(BONE)
/* QNX, MPE and BeOS do not appear to support supplementary groups. */
return 0;
#else /* ndef QNX */
1.30 +1 -1 apache-1.3/src/support/htdigest.c
Index: htdigest.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/htdigest.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- htdigest.c 2000/01/26 04:36:53 1.29
+++ htdigest.c 2000/11/03 18:38:09 1.30
@@ -72,7 +72,7 @@
#endif
#include "ap.h"
#include "ap_md5.h"
-#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM) || defined(OS390) || defined(BEOS)
+#if defined(MPE) || defined(QNX) || defined(WIN32) || defined(__TANDEM) || defined(OS390) || defined(BEOS) || defined(BONE)
#include <signal.h>
#else
#include <sys/signal.h>