cvs commit: apache/support Makefile
brian 97/01/06 23:23:44 Modified:support Makefile Log: Accidentally added entry for suexec, it's now removed. Revision ChangesPath 1.17 +0 -3 apache/support/Makefile Index: Makefile === RCS file: /export/home/cvs/apache/support/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -C3 -r1.16 -r1.17 *** Makefile 1997/01/07 06:46:01 1.16 --- Makefile 1997/01/07 07:23:43 1.17 *** *** 70,78 logresolve: logresolve.c $(CC) $(INCLUDES) $(CFLAGS) logresolve.c -o logresolve $(EXTRA_LIBS) - suexec: suexec.c - $(CC) $(INCLUDES) $(CFLAGS) suexec.c -o suexec - clean: rm -f $(TARGETS) --- 70,75
cvs commit: apache/support Makefile
brian 97/01/06 22:46:02 Modified:support Makefile Log: Reviewed by: Brian Behlendorf <[EMAIL PROTECTED]> Submitted by: Garey Smiley <[EMAIL PROTECTED]> Since some support tools use stuff from the regex libraries. Revision ChangesPath 1.16 +5 -3 apache/support/Makefile Index: Makefile === RCS file: /export/home/cvs/apache/support/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C3 -r1.15 -r1.16 *** Makefile 1996/11/03 21:02:29 1.15 --- Makefile 1997/01/07 06:46:01 1.16 *** *** 6,19 #For Optimization #CFLAGS= -O2 #For debugging ! CFLAGS= -g # For SCO ODT #EXTRA_LIBS= -lcrypt_i # For OS/2 port #EXTRA_LIBS= -llibufc -lsocket ! ! INCLUDES= -I../src RM= /bin/rm -f #--- You shouldn't have to edit anything else. --- --- 6,18 #For Optimization #CFLAGS= -O2 #For debugging ! CFLAGS= -g -Wall # For SCO ODT #EXTRA_LIBS= -lcrypt_i # For OS/2 port #EXTRA_LIBS= -llibufc -lsocket ! INCLUDES= -I../src -I../src/regex RM= /bin/rm -f #--- You shouldn't have to edit anything else. --- *** *** 70,75 --- 69,77 logresolve: logresolve.c $(CC) $(INCLUDES) $(CFLAGS) logresolve.c -o logresolve $(EXTRA_LIBS) + + suexec: suexec.c + $(CC) $(INCLUDES) $(CFLAGS) suexec.c -o suexec clean: rm -f $(TARGETS)
cvs commit: apache/conf srm.conf-dist
akosut 97/01/06 22:38:05 Modified:conf srm.conf-dist Log: Remove reference to non-existant CGI script. Revision ChangesPath 1.11 +0 -8 apache/conf/srm.conf-dist Index: srm.conf-dist === RCS file: /export/home/cvs/apache/conf/srm.conf-dist,v retrieving revision 1.10 retrieving revision 1.11 diff -C3 -r1.10 -r1.11 *** srm.conf-dist 1997/01/01 18:28:21 1.10 --- srm.conf-dist 1997/01/07 06:38:04 1.11 *** *** 173,186 # Format: Action media/type /cgi-script/location # Format: Action handler-name /cgi-script/location - # For example to add a footer (footer.html in your document root) to - # files with extension .foot (e.g. foo.html.foot), you could use: - #AddHandler foot-action foot - #Action foot-action /cgi-bin/footer - - # Or to do this for all HTML files, for example, use: - #Action text/html /cgi-bin/footer - # MetaDir: specifies the name of the directory in which Apache can find # meta information files. These files contain additional HTTP headers # to include when sending the document --- 173,178
cvs commit: apache/src httpd.h
brian 97/01/06 22:18:14 Modified:src httpd.h Log: Reviewed by: sameer <[EMAIL PROTECTED]>, Chuck Murcko <[EMAIL PROTECTED]> Submitted by: Marc Slemko <[EMAIL PROTECTED]> Removed no-longer-relevant comment. Revision ChangesPath 1.79 +1 -3 apache/src/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache/src/httpd.h,v retrieving revision 1.78 retrieving revision 1.79 diff -C3 -r1.78 -r1.79 *** httpd.h 1997/01/01 18:10:23 1.78 --- httpd.h 1997/01/07 06:18:12 1.79 *** *** 217,225 * We keep a hard maximum number of servers, for two reasons --- first off, * in case something goes seriously wrong, we want to stop the fork bomb * short of actually crashing the machine we're running on by filling some ! * kernel table (I was originally going to make this 256, but it turns out ! * that that would actually fill the process table on reasonably configured ! * machines). Secondly, it keeps the size of the scoreboard file small * enough that we can read the whole thing without worrying too much about * the overhead. */ --- 217,223 * We keep a hard maximum number of servers, for two reasons --- first off, * in case something goes seriously wrong, we want to stop the fork bomb * short of actually crashing the machine we're running on by filling some ! * kernel table. Secondly, it keeps the size of the scoreboard file small * enough that we can read the whole thing without worrying too much about * the overhead. */
cvs commit: apache/src Makefile.tmpl
chuck 97/01/06 21:15:11 Modified:src Makefile.tmpl Log: Replace hardcoded instances of make with $(MAKE). Revision ChangesPath 1.35 +4 -4 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.34 retrieving revision 1.35 diff -C3 -r1.34 -r1.35 *** Makefile.tmpl 1996/11/20 19:55:06 1.34 --- Makefile.tmpl 1997/01/07 05:15:10 1.35 *** *** 28,43 $(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS) regex/libregex.a: ! (cd regex; make lib CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB=$(RANLIB)) modules/proxy/libproxy.a: (cd modules; \ ! make CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB=$(RANLIB)) clean: rm -f httpd $(OBJS) *pure* ! cd regex; make clean ! cd modules; make clean dist.tar: # Assure a semi-sensible configuration going out... --- 28,43 $(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS) regex/libregex.a: ! (cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB=$(RANLIB)) modules/proxy/libproxy.a: (cd modules; \ ! $(MAKE) CC=$(CC) AUX_CFLAGS="$(CFLAGS)" RANLIB=$(RANLIB)) clean: rm -f httpd $(OBJS) *pure* ! cd regex; $(MAKE) clean ! cd modules; $(MAKE) clean dist.tar: # Assure a semi-sensible configuration going out...
cvs commit: apache/src/helpers GuessOS
jim 97/01/06 13:12:06
Modified:src Configure conf.h
src/helpers GuessOS
Log:
Added CONVEXOS11 and minor fix
Revision ChangesPath
1.65 +6 -0 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.64
retrieving revision 1.65
diff -C3 -r1.64 -r1.65
*** Configure 1997/01/06 17:27:54 1.64
--- Configure 1997/01/06 21:12:01 1.65
***
*** 344,349
--- 344,355
OS='MachTen'
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
+ *convex-v11*)
+ OS='CONVEXOS11'
+ CFLAGS="$CFLAGS -DCONVEXOS11"
+ CC='cc'
+ DEF_WANTHSREGEX=yes
+ ;;
*) # default: Catch systems we don't know about
echo Sorry, but we cannot grok \"$PLAT\"
echo uname -m
1.65 +9 -1 apache/src/conf.h
Index: conf.h
===
RCS file: /export/home/cvs/apache/src/conf.h,v
retrieving revision 1.64
retrieving revision 1.65
diff -C3 -r1.64 -r1.65
*** conf.h1997/01/01 18:10:15 1.64
--- conf.h1997/01/06 21:12:02 1.65
***
*** 419,424
--- 419,432
#define FCNTL_SERIALIZED_ACCEPT
#endif
+ /* Convex OS v11 */
+ #elif defined(CONVEXOS11)
+ #define NO_TIMEZONE
+ #include
+ #include
+ #define JMB_BUF jmp_buf
+ typedef int rlim_t;
+
/* Unknown system - Edit these to match */
#else
#ifdef BSD
***
*** 481,487
#include
#include
#include
! #ifndef QNX
#include
#endif
#ifdef NEED_PROCESS_H
--- 489,495
#include
#include
#include
! #if !defined(QNX) && !defined(CONVEXOS11)
#include
#endif
#ifdef NEED_PROCESS_H
1.13 +5 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.12
retrieving revision 1.13
diff -C3 -r1.12 -r1.13
*** GuessOS 1997/01/06 17:27:55 1.12
--- GuessOS 1997/01/06 21:12:05 1.13
***
*** 164,172
--- 164,177
machten:*)
echo "${MACHINE}-tenon-${SYSTEM}"; exit 0;
+;;
library:*)
echo "${MACHINE}-ncr-sysv4"; exit 0
+ ;;
+
+ ConvexOS:*:11.0:*)
+ echo "${MACHINE}-v11-${SYSTEM}"; exit 0;
;;
esac
cvs commit: apache/src/helpers PrintPath
jim 97/01/06 10:10:23 Modified:src/helpers PrintPath Log: Minor change... don't count dirs Revision ChangesPath 1.5 +1 -1 apache/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache/src/helpers/PrintPath,v retrieving revision 1.4 retrieving revision 1.5 diff -C3 -r1.4 -r1.5 *** PrintPath 1997/01/06 17:31:28 1.4 --- PrintPath 1997/01/06 18:10:23 1.5 *** *** 15,21 s/:$/:./ s/:/ /g' ` do ! if [ -r $path/$1 ]; then if [ "$echo" = "yes" ]; then echo $path/$1 fi --- 15,21 s/:$/:./ s/:/ /g' ` do ! if [ -r $path/$1 ] && [ ! -d $path/$1 ]; then if [ "$echo" = "yes" ]; then echo $path/$1 fi
cvs commit: apache/src/helpers PrintPath
jim 97/01/06 09:31:30 Modified:src/helpers PrintPath Log: ULTRIX hack... see if readable since ULTRIX does not support the executable test Revision ChangesPath 1.4 +1 -1 apache/src/helpers/PrintPath Index: PrintPath === RCS file: /export/home/cvs/apache/src/helpers/PrintPath,v retrieving revision 1.3 retrieving revision 1.4 diff -C3 -r1.3 -r1.4 *** PrintPath 1996/12/11 18:35:38 1.3 --- PrintPath 1997/01/06 17:31:28 1.4 *** *** 15,21 s/:$/:./ s/:/ /g' ` do ! if [ -x $path/$1 ]; then if [ "$echo" = "yes" ]; then echo $path/$1 fi --- 15,21 s/:$/:./ s/:/ /g' ` do ! if [ -r $path/$1 ]; then if [ "$echo" = "yes" ]; then echo $path/$1 fi
cvs commit: apache/src/helpers GuessOS
jim 97/01/06 09:27:56
Modified:src Configure
src/helpers GuessOS
Log:
MachTen fixes for Configure family
Revision ChangesPath
1.64 +2 -1 apache/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.63
retrieving revision 1.64
diff -C3 -r1.63 -r1.64
*** Configure 1996/12/28 00:09:09 1.63
--- Configure 1997/01/06 17:27:54 1.64
***
*** 340,346
CFLAGS="-DULTRIX"
DEF_WANTHSREGEX=yes
;;
! *-powerpc-tenon-*)
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
*) # default: Catch systems we don't know about
--- 340,347
CFLAGS="-DULTRIX"
DEF_WANTHSREGEX=yes
;;
! *powerpc-tenon-machten*)
! OS='MachTen'
LFLAGS="$LFLAGS -Xlstack=131072 -Xldelcsect"
;;
*) # default: Catch systems we don't know about
1.12 +3 -0 apache/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache/src/helpers/GuessOS,v
retrieving revision 1.11
retrieving revision 1.12
diff -C3 -r1.11 -r1.12
*** GuessOS 1996/12/11 13:48:59 1.11
--- GuessOS 1997/01/06 17:27:55 1.12
***
*** 162,167
--- 162,170
echo "${MACHINE}-sni-sysv4"; exit 0
;;
+ machten:*)
+echo "${MACHINE}-tenon-${SYSTEM}"; exit 0;
+
library:*)
echo "${MACHINE}-ncr-sysv4"; exit 0
;;
