jim 97/12/20 17:58:57
Modified: . STATUS
src Configure
src/main conf.h
src/modules/standard mod_usertrack.c
Log:
Obtained from: Mark Bixby
Submitted by: Jim Jagielski
Reviewed by: Jim Jagielski, Dean Gaudet
Updates required for the MPR port; biggest issue is that MPE's
"internal" 'cat' is braindead, so we need to be able to force
/bin/cat for Configure.
Revision Changes Path
1.11 +1 -4 apachen/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apachen/STATUS,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- STATUS 1997/12/21 01:54:37 1.10
+++ STATUS 1997/12/21 01:58:46 1.11
@@ -44,6 +44,7 @@
* Brian Havard's [PATCH] mod_mime_magic and OS/2
* Igor Tatarinov's [PATCH] usage patch (-V)
* Dean's [PATCH] child_timeout not correctly defined
+ * Mark Bixby's [PORT] MPE porting patch
Available:
@@ -66,10 +67,6 @@
* Dean's [PATCH] fix Rasmus' chunking error
<[EMAIL PROTECTED]>
Status: Dean +1
-
- * Mark Bixby's [PORT] MPE porting patch
- <[EMAIL PROTECTED]>
- Status: Jim +1, Dean +1
* Dean's [PATCH] mod_status cleanups
<[EMAIL PROTECTED]>
1.175 +17 -15 apachen/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apachen/src/Configure,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- Configure 1997/12/01 16:51:48 1.174
+++ Configure 1997/12/21 01:58:53 1.175
@@ -165,6 +165,7 @@
SHELL="/bin/sh"
TARGET="httpd"
PRINTPATH=PrintPath
+CAT="cat"
if ./helpers/$PRINTPATH -s ranlib; then
RANLIB="ranlib"
@@ -202,8 +203,9 @@
*MPE/iX*)
OS='MPE/iX'
CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
- LIBS="$LIBS -lsocket"
+ LIBS="$LIBS -lsocket -lsvipc"
LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
+ CAT="/bin/cat" # built-in cat is badly broken for stdin redirection
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
@@ -814,7 +816,7 @@
# echo bas=$modbase ext=$ext
if [ -r $modbase.module ] ; then
- cat $modbase.module > $tmpfile2
+ $CAT $modbase.module > $tmpfile2
else
if [ -f $modbase.c ] ; then
# Guess module structure name in case there is not
@@ -824,7 +826,7 @@
sed 's/[ ]*;[ ]*$//'`
# Get any module definition part
if grep "MODULE-DEFINITION-" $modbase.c > /dev/null; then
- cat $modbase.c | \
+ $CAT $modbase.c | \
sed '1,/MODULE-DEFINITION-START/d;/MODULE-DEFINITION-END/,$d' \
> $tmpfile2
fi
@@ -922,11 +924,11 @@
# Add the module targets to the Makefile. Do not add individual object
# targets for auto-generated directories.
-cat > $awkfile <<EOF1
+$CAT > $awkfile <<EOF1
BEGIN {
split ("$AUTODIRS", tmp, " ")
EOF1
-cat >> $awkfile <<'EOF2'
+$CAT >> $awkfile <<'EOF2'
for ( key in tmp ) {
autodirs[tmp[key]] = 1
}
@@ -955,11 +957,11 @@
# Now add the auto-generated library targets. Need to use awk so we
# don't hang a continuation on the last line.
-cat > $awkfile <<EOF3
+$CAT > $awkfile <<EOF3
BEGIN {
split ("$AUTOLIBS", libs)
EOF3
-cat >> $awkfile <<'EOF4'
+$CAT >> $awkfile <<'EOF4'
z = 0
for ( lib in libs ) {
if (z != 0)
@@ -1027,7 +1029,7 @@
#
# ./Makefile
#
-cat Makefile.config >> Makefile
+$CAT Makefile.config >> Makefile
sed -e "s#@@Configuration@@#$file#" "Makefile.tmpl" >>Makefile
#
@@ -1036,12 +1038,12 @@
MAKEDIRS="support main ap regex $OSDIR"
for dir in $MAKEDIRS ; do
echo Creating Makefile in $dir
- cat Makefile.config $dir/Makefile.tmpl > $dir/Makefile
+ $CAT Makefile.config $dir/Makefile.tmpl > $dir/Makefile
done
-cat Makefile.config >modules/Makefile
+$CAT Makefile.config >modules/Makefile
-cat << EOF >> modules/Makefile
+$CAT << EOF >> modules/Makefile
MODULES=$MODDIRS
CFLAGS=\$(OPTIM) \$(CFLAGS1) \$(EXTRA_CFLAGS)
@@ -1055,8 +1057,8 @@
for moddir in $AUTODIRS ; do
echo "Creating Makefile in $moddir"
- cat Makefile.config > $moddir/Makefile
- cat << 'EOF' >> $moddir/Makefile
+ $CAT Makefile.config > $moddir/Makefile
+ $CAT << 'EOF' >> $moddir/Makefile
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(INCLUDES_DEPTH2) $(EXTRA_INCLUDES)
@@ -1081,7 +1083,7 @@
}'
echo "LIB=lib$basedir.a" >> $moddir/Makefile
- cat << 'EOF' >> $moddir/Makefile
+ $CAT << 'EOF' >> $moddir/Makefile
all: $(LIB)
@@ -1100,6 +1102,6 @@
EOF
fi
- cat >> $moddir/Makefile < $moddir/Makefile.tmpl
+ $CAT >> $moddir/Makefile < $moddir/Makefile.tmpl
done
1.164 +7 -0 apachen/src/main/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apachen/src/main/conf.h,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- conf.h 1997/12/19 02:16:01 1.163
+++ conf.h 1997/12/21 01:58:55 1.164
@@ -92,6 +92,9 @@
#define NO_SETSID
#define NO_KILLPG
#define NO_WRITEV
+#define HAVE_SHMGET
+#define SHM_R 0400 /* Read permission */
+#define SHM_W 0200 /* Write permission */
#define NEED_INITGROUPS
#define NEED_STRCASECMP
#define NEED_STRDUP
@@ -101,6 +104,10 @@
extern char *inet_ntoa();
#define NO_SLACK
#define NO_GETTIMEOFDAY
+#define S_IEXEC S_IXUSR
+#define S_IREAD S_IRUSR
+#define S_IWRITE S_IWUSR
+#define PF_INET AF_INET
#elif defined(SUNOS4)
#define HAVE_GMTOFF
1.22 +1 -1 apachen/src/modules/standard/mod_usertrack.c
Index: mod_usertrack.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/standard/mod_usertrack.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mod_usertrack.c 1997/11/05 11:23:23 1.21
+++ mod_usertrack.c 1997/12/21 01:58:57 1.22
@@ -98,7 +98,7 @@
#include "httpd.h"
#include "http_config.h"
#include "http_core.h"
-#ifndef WIN32
+#if !defined(WIN32) && !defined(MPE)
#include <sys/time.h>
#endif
