jim 96/07/29 15:52:03
Modified: src CHANGES Configuration.tmpl Makefile.tmpl README Log: allow for selectable use of regex/libregex.a via Configuration.tmpl Revision Changes Path 1.46 +5 -1 apache/src/CHANGES 1.23 +8 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl =================================================================== RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.22 retrieving revision 1.23 diff -C3 -r1.22 -r1.23 *** Configuration.tmpl 1996/07/28 10:32:17 1.22 --- Configuration.tmpl 1996/07/29 22:52:00 1.23 *************** *** 75,80 **** --- 75,88 ---- # -lndbm is commonly required for DBM auth, if that is configured in. EXTRA_LIBS= + # Apache requires a POSIX regex implementation. Some/most platforms provide + # this capability, but for those that don't, Apache provides, simply for + # convenience, a regex implementation. The regex code is NOT official + # Apache code and the Apache team does not support or guarantee the code. + # If you want to use the supplied regex package, uncomment the following + # line (or set it equal to the regex lib on your system) + #REGLIBS=regex/libregex.a + # Default to using ranlib on libraries (for regex). Set this to something else # if ranlib kills your system (usually by setting it again in the OS specific # section below) 1.18 +2 -4 apache/src/Makefile.tmpl Index: Makefile.tmpl =================================================================== RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.17 retrieving revision 1.18 diff -C3 -r1.17 -r1.18 *** Makefile.tmpl 1996/07/28 10:32:17 1.17 --- Makefile.tmpl 1996/07/29 22:52:01 1.18 *************** *** 7,14 **** http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o buff.o\ md5c.o util_md5.o explain.o http_bprintf.o $(MODULES) - LIBS= regex/libregex.a - .c.o: $(CC) -c $(CFLAGS) $(AUX_CFLAGS) $< --- 7,12 ---- *************** *** 21,28 **** @echo "If not, you will at least have to touch Configuration." @false ! httpd: $(LIBS) $(OBJS) ! $(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(LIBS) $(EXTRA_LIBS) $(AUX_LIBS) regex/libregex.a: cd regex; make lib CC=$(CC) AUX_CFLAGS="$(CFLAGS) $(AUX_CFLAGS)" RANLIB=$(RANLIB) --- 19,26 ---- @echo "If not, you will at least have to touch Configuration." @false ! httpd: $(REGLIBS) $(OBJS) ! $(CC) $(LFLAGS) $(AUX_LFLAGS) -o httpd $(OBJS) $(REGLIBS) $(EXTRA_LIBS) $(AUX_LIBS) regex/libregex.a: cd regex; make lib CC=$(CC) AUX_CFLAGS="$(CFLAGS) $(AUX_CFLAGS)" RANLIB=$(RANLIB) 1.10 +7 -0 apache/src/README Index: README =================================================================== RCS file: /export/home/cvs/apache/src/README,v retrieving revision 1.9 retrieving revision 1.10 diff -C3 -r1.9 -r1.10 *** README 1996/07/10 13:50:41 1.9 --- README 1996/07/29 22:52:01 1.10 *************** *** 227,229 **** --- 227,236 ---- MOVEBREAK: Amount to move sbrk() breakpoint, if required, before attaching shared-memory segment. + + RLIMIT_CPU: + RLIMIT_DATA: + RLIMIT_VMEM: + RLIMIT_NPROC: + Use the getrlimit/setrlimit calls to adjust/set the rlimit values + for the specified limits.