cvs commit: apache/src Configuration.tmpl
dgaudet 98/01/23 10:53:41 Modified:src Tag: APACHE_1_2_X Configuration.tmpl Log: I'm tired of the damn bug reports. Revision ChangesPath No revision No revision 1.63.2.2 +3 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.63.2.1 retrieving revision 1.63.2.2 diff -u -r1.63.2.1 -r1.63.2.2 --- Configuration.tmpl1997/10/22 00:18:43 1.63.2.1 +++ Configuration.tmpl1998/01/23 18:53:40 1.63.2.2 @@ -41,6 +41,9 @@ # Settings here have priority; If not set, Configure will attempt to guess # the C compiler, and set OPTIM to '-O2' # +# REDHAT LINUX 5.0 USERS PLEASE NOTE! You have to add -lcrypt to +# EXTRA_LIBS. This is fixed in 1.3 but will not be fixed in 1.2. +# EXTRA_CFLAGS= EXTRA_LFLAGS= EXTRA_LIBS=
cvs commit: apache/src Configuration.tmpl
dgaudet 97/10/21 17:18:44 Modified:src Tag: APACHE_1_2_X Configuration.tmpl Log: PR#1279: Documentation sucks. Modules are listed in reverse priority order, not priority order. (already fixed in 1.3) Revision ChangesPath No revision No revision 1.63.2.1 +2 -2 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.63 retrieving revision 1.63.2.1 diff -u -r1.63 -r1.63.2.1 --- Configuration.tmpl1997/05/10 17:14:36 1.63 +++ Configuration.tmpl1997/10/22 00:18:43 1.63.2.1 @@ -18,8 +18,8 @@ # control Configure's behavior as far as how to create Makefile. # # Module selection lines, distinguished by having 'Module' at the front. -# These list the configured modules, in priority order (highest priority -# first). They're down at the bottom. +# These list the configured modules, in reverse priority order (lowest +# priority first). They're down at the bottom. # # Optional module selection lines, distinguished by having `%Module' # at the front. These specify a module that is to be compiled in (but
cvs commit: apache/src Configuration.tmpl
rse 97/08/05 03:17:53 Modified:src Configuration.tmpl Log: Make it more clear that mod_rewrite is a much more complicated beast as the others due to the nature of the rule-based approach. Revision ChangesPath 1.70 +3 -2 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.69 retrieving revision 1.70 diff -u -r1.69 -r1.70 --- Configuration.tmpl1997/08/04 23:45:58 1.69 +++ Configuration.tmpl1997/08/05 10:17:52 1.70 @@ -218,8 +218,9 @@ Module alias_modulemod_alias.o -## mod_rewrite allows for powerful URI-to-URI and URI-to-filename mapping, -## using regular expressions. +## The URL rewriting module allows for powerful URI-to-URI and +## URI-to-filename mapping using a regular expression based +## rule-controlled rewriting engine. # Module rewrite_module mod_rewrite.o
cvs commit: apache/src Configuration.tmpl Configure
jim 97/07/21 10:51:31 Modified:src Configuration.tmpl Configure Log: Add the IRIXN32 RULE for Configure/Configuration.tmpl Revision ChangesPath 1.67 +6 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.66 retrieving revision 1.67 diff -C3 -r1.66 -r1.67 *** Configuration.tmpl1997/07/08 19:50:45 1.66 --- Configuration.tmpl1997/07/21 17:51:29 1.67 *** *** 57,63 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS, and IRIXNIS. # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default --- 57,63 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS, IRIXNIS and IRIXN32 # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default *** *** 80,89 --- 80,94 # SGI IRIX. If you are, and you are using NIS, you should set this # to 'yes' # + # IRIXN32: + # If you are running a version of IRIX and Configure detects + # n32 libraries, it will use those instead of the o32 ones. + # Rule STATUS=yes Rule SOCKS4=no Rule IRIXNIS=no + Rule IRIXN32=yes # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for 1.117 +15 -6 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.116 retrieving revision 1.117 diff -C3 -r1.116 -r1.117 *** Configure 1997/07/21 12:27:16 1.116 --- Configure 1997/07/21 17:51:29 1.117 *** *** 165,170 --- 165,171 RULE_STATUS=`./helpers/CutRule STATUS $file` RULE_SOCKS4=`./helpers/CutRule SOCKS4 $file` RULE_IRIXNIS=`./helpers/CutRule IRIXNIS $file` + RULE_IRIXN32=`./helpers/CutRule IRIXN32 $file` # Preset some constants; can be overridden on a per-platform basis below. *** *** 268,283 fi ;; *-sgi-irix32) - CFLAGS=$CFLAGS -n32 - LDFLAGS=$LDFLAGS -n32 DEF_WANTHSREGEX=yes DBM_LIB= ! CFLAGS=$CFLAGS -DIRIX ! if [ $RULE_IRIXNIS = yes ]; then ! OS='SGI IRIX-32 w/NIS' else ! OS='SGI IRIX-32' fi ;; *-sgi-irix) DEF_WANTHSREGEX=yes --- 269,292 fi ;; *-sgi-irix32) DEF_WANTHSREGEX=yes DBM_LIB= ! if [ $RULE_IRIXN32 = yes ]; then ! CFLAGS=$CFLAGS -n32 ! LDFLAGS=$LDFLAGS -n32 ! if [ $RULE_IRIXNIS = yes ]; then ! OS='SGI IRIX-32 w/NIS' ! else ! OS='SGI IRIX-32' ! fi else ! if [ $RULE_IRIXNIS = yes ]; then ! OS='SGI IRIX w/NIS' ! else ! OS='SGI IRIX' ! fi fi + CFLAGS=$CFLAGS -DIRIX ;; *-sgi-irix) DEF_WANTHSREGEX=yes
cvs commit: apache/src Configuration.tmpl Configure
jim 97/05/10 10:14:38 Modified:src Configuration.tmpl Configure Log: Fix problem with HP-UX cc compiler Revision ChangesPath 1.63 +1 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.62 retrieving revision 1.63 diff -C3 -r1.62 -r1.63 *** Configuration.tmpl1997/04/27 09:58:32 1.62 --- Configuration.tmpl1997/05/10 17:14:36 1.63 *** *** 47,53 EXTRA_INCLUDES= #CC= ! OPTIM=-O2 #RANLIB= --- 47,53 EXTRA_INCLUDES= #CC= ! #OPTIM=-O2 #RANLIB= 1.94 +26 -16apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.93 retrieving revision 1.94 diff -C3 -r1.93 -r1.94 *** Configure 1997/04/27 07:52:16 1.93 --- Configure 1997/05/10 17:14:36 1.94 *** *** 46,53 # First, strip comments and blank lines and then change Rules to comments ! sed 's/#.*//' $file | sed '/^[ ]*$/d' | sed 's/[ ]*$//' | \ ! sed 's/^Rule[ ]*/##Rule:/' $tmpfile # Check for syntax errors... --- 46,55 # First, strip comments and blank lines and then change Rules to comments ! sed 's/#.*//' $file | \ ! sed '/^[ ]*$/d' | \ ! sed 's/[ ]*$//' | \ ! sed 's/^Rule[ ]*/##Rule:/' | \ # Check for syntax errors... *** *** 165,170 --- 167,186 fi # + # We now look for popular compilers. As with ranlib, we + # do this early but because some options may depend + # on which compiler we use/find + # + for compilers in gcc cc acc c89 + do + lookedfor=$lookedfor $compilers + if ./helpers/PrintPath -s $compilers; then + COMPILER=$compilers + break + fi + done + + # SHELL=/bin/sh case $PLAT in *** *** 210,232 OS='HI-UX' CFLAGS=$CFLAGS -DHIUX # if we're using the HIUX compiler, add a few flags. ! if [ $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HIUX_SOURCE fi ;; *-hp-hpux10.*) OS='HP-UX 10' CFLAGS=$CFLAGS -DHPUX10 # if we're using the HPUX compiler, add a few flags. ! if [ $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE fi ;; *-hp-hpux*) OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ! if [ $CC = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE fi ;; *-sgi-irix64) --- 226,251 OS='HI-UX' CFLAGS=$CFLAGS -DHIUX # if we're using the HIUX compiler, add a few flags. ! if [ $CC = cc ] || [ $COMPILER = cc ]; then CFLAGS=$CFLAGS -Aa -D_HIUX_SOURCE + OPTIM= fi ;; *-hp-hpux10.*) OS='HP-UX 10' CFLAGS=$CFLAGS -DHPUX10 # if we're using the HPUX compiler, add a few flags. ! if [ $CC = cc ] || [ $COMPILER = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE + OPTIM= fi ;; *-hp-hpux*) OS='HP-UX' CFLAGS=$CFLAGS -DHPUX ! if [ $CC = cc ] || [ $COMPILER = cc ]; then CFLAGS=$CFLAGS -Aa -D_HPUX_SOURCE + OPTIM= fi ;; *-sgi-irix64) *** *** 321,327 ;; *-isc4*) OS='ISC 4' ! CC=gcc CFLAGS=$CFLAGS -posix -DISC LFLAGS=$LFLAGS -posix LIBS=$LIBS -linet --- 340,346 ;; *-isc4*) OS='ISC 4' ! CC='gcc' CFLAGS=$CFLAGS -posix -DISC LFLAGS=$LFLAGS -posix LIBS=$LIBS -linet *** *** 470,487 # to use. Settings of CC and OPTIM in Configuration have # the highest precedence; next comes any settings from # the above OS-specific section. If still unset, ! # then we look for some popular compilers in our $PATH # and set a safe optimization level # - - for compilers in gcc cc acc c89 - do - lookedfor=$lookedfor $compilers - if ./helpers/PrintPath -s $compilers; then - COMPILER=$compilers - break - fi - done if grep CC= Makefile /dev/null; then CC= # clear it just in case --- 489,497 # to use. Settings of CC and OPTIM in Configuration have # the highest precedence; next comes any settings from # the above OS-specific section. If still unset, ! # then we use the found location of COMPILERS above # and set a
cvs commit: apache/src Configuration.tmpl
fielding97/04/27 02:58:33 Modified:src Configuration.tmpl Log: remove redundant and out-of-place comment Revision ChangesPath 1.62 +1 -2 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.61 retrieving revision 1.62 diff -C3 -r1.61 -r1.62 *** Configuration.tmpl1997/04/27 09:54:34 1.61 --- Configuration.tmpl1997/04/27 09:58:32 1.62 *** *** 171,178 ## mod_include translates server-side include (SSI) statements in text files. ## mod_dir handles requests on directories and directory indexes. ! ## mod_cgi handles CGI scripts. mod_env sets up additional or restricted ! ## environment variables to be passed to CGI/SSI scripts. Module includes_module mod_include.o Module dir_module mod_dir.o --- 171,177 ## mod_include translates server-side include (SSI) statements in text files. ## mod_dir handles requests on directories and directory indexes. ! ## mod_cgi handles CGI scripts. Module includes_module mod_include.o Module dir_module mod_dir.o
cvs commit: apache/src Configuration.tmpl
sameer 97/04/25 15:02:45 Modified:src Configuration.tmpl Log: Reorder configuration.tmpl so that url-munging is in the right order Reviewed by: Roy Fielding, Dean Gaudet, Chuck Murcko Submitted by: Sameer Parekh Revision ChangesPath 1.59 +20 -11apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.58 retrieving revision 1.59 diff -c -C3 -r1.58 -r1.59 *** Configuration.tmpl1997/04/15 20:00:20 1.58 --- Configuration.tmpl1997/04/25 22:02:44 1.59 *** *** 138,147 Module dir_module mod_dir.o Module cgi_module mod_cgi.o Module userdir_module mod_userdir.o - Module alias_modulemod_alias.o Module env_module mod_env.o Module config_log_module mod_log_config.o ## The asis module implemented .asis file types, which allow the embedding ## of HTTP headers at the beginning of the document. mod_imap handles internal ## imagemaps (no more cgi-bin/imagemap/!). mod_actions is used to specify --- 138,166 Module dir_module mod_dir.o Module cgi_module mod_cgi.o Module userdir_module mod_userdir.o Module env_module mod_env.o Module config_log_module mod_log_config.o + + ## + ## The next three modules here are URL manipulation + ## + + ## Finally, the proxy module. It's not as complete as it could be yet. + ## But it's getting there. + + # Module proxy_modulemodules/proxy/libproxy.a + + ## + ## Alias module + + Module alias_modulemod_alias.o + + ## mod_rewrite allows for powerful URI-to-filename mapping, using + ## regular expressions. + + # Module rewrite_module mod_rewrite.o + ## The asis module implemented .asis file types, which allow the embedding ## of HTTP headers at the beginning of the document. mod_imap handles internal ## imagemaps (no more cgi-bin/imagemap/!). mod_actions is used to specify *** *** 161,171 # Module agent_log_modulemod_log_agent.o # Module referer_log_module mod_log_referer.o - ## mod_rewrite allows for powerful URI-to-filename mapping, using - ## regular expressions. - - # Module rewrite_module mod_rewrite.o - ## cern_meta mimics the behavior of the CERN web server with regards to ## metainformation files. --- 180,185 *** *** 243,250 ## the file modules/example/README for details. # Module example_module modules/example/mod_example.o - - ## Finally, the proxy module. It's not as complete as it could be yet. - ## But it's getting there. - - # Module proxy_modulemodules/proxy/libproxy.a --- 257,259
cvs commit: apache/src Configuration.tmpl Makefile.tmpl
brian 97/01/24 02:19:40 Modified:src Configuration.tmpl Makefile.tmpl Log: Removed mention of FastCGI, now that it's no longer part of the distribution. Revision ChangesPath 1.54 +0 -7 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.53 retrieving revision 1.54 diff -C3 -r1.53 -r1.54 *** Configuration.tmpl1996/12/24 19:14:24 1.53 --- Configuration.tmpl1997/01/24 10:19:38 1.54 *** *** 229,241 # Module usertrack_module mod_usertrack.o - ## FastCGI is a high-performance alternative to CGI. To develop a - ## FastCGI application in your chosen language (Perl, C, etc.) you'll - ## need a FastCGI library for that language; libraries, and complete - ## information on FastCGI, are available from http://www.fastcgi.com/. - - # Module fastcgi_module mod_fastcgi.o - ## Finally, the proxy module. It's not as complete as it could be yet. ## But it's getting there. --- 229,234 1.38 +0 -2 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.37 retrieving revision 1.38 diff -C3 -r1.37 -r1.38 *** Makefile.tmpl 1997/01/21 00:12:23 1.37 --- Makefile.tmpl 1997/01/24 10:19:39 1.38 *** *** 94,101 mod_dld.o: httpd.h http_config.h http_conf_globals.h mod_env.o: httpd.h http_config.h mod_expires.o: httpd.h http_config.h http_log.h - mod_fastcgi.o: httpd.h http_config.h http_request.h http_core.h http_log.h \ -http_protocol.h http_main.h util_script.h http_conf_globals.h mod_headers.o: httpd.h http_config.h mod_imap.o: httpd.h http_config.h http_request.h http_core.h http_protocol.h \ http_main.h http_log.h util_script.h --- 94,99
cvs commit: apache/src Configuration.tmpl
chuck 96/12/24 11:14:25 Modified:src Configuration.tmpl Log: Stop scaring off the proxy user candidates. 8^) Revision ChangesPath 1.53 +2 -2 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.52 retrieving revision 1.53 diff -C3 -r1.52 -r1.53 *** Configuration.tmpl1996/11/10 14:51:56 1.52 --- Configuration.tmpl1996/12/24 19:14:24 1.53 *** *** 236,242 # Module fastcgi_module mod_fastcgi.o ! ## Finally, the proxy module. It's not as complete as it could ! ## be yet, so use at your own risk. # Module proxy_modulemodules/proxy/libproxy.a --- 236,242 # Module fastcgi_module mod_fastcgi.o ! ## Finally, the proxy module. It's not as complete as it could be yet. ! ## But it's getting there. # Module proxy_modulemodules/proxy/libproxy.a
cvs commit: apache/src Configuration.tmpl Configure conf.h
akosut 96/10/21 21:21:47 Modified:src Configuration.tmpl Configure conf.h Log: Remove the BADMMAP rule, and fix HP-UX shared memory (finally). Revision ChangesPath 1.46 +2 -8 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.45 retrieving revision 1.46 diff -C3 -r1.45 -r1.46 *** Configuration.tmpl1996/10/22 00:03:06 1.45 --- Configuration.tmpl1996/10/22 04:21:43 1.46 *** *** 1,4 ! # $Id: Configuration.tmpl,v 1.45 1996/10/22 00:03:06 jim Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should --- 1,4 ! # $Id: Configuration.tmpl,v 1.46 1996/10/22 04:21:43 akosut Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should *** *** 53,59 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS, BADMMAP and IRIXNIS. # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default --- 53,59 # functions. The format is: Rule RULE=value # # At present, only the following RULES are known: WANTHSREGEX, SOCKS4, ! # STATUS and IRIXNIS. # # For all Rules, if set to yes, then Configure knows we want that # capability and does what is required to add it in. If set to default *** *** 94,107 # not use this one by setting WANTHSREGEX to 'no' or commenting # out the Rule. The default action is no unless overruled # by OS specifics - # - # BADMMAP: - # If you find that your OS can't cope with mmap (compiles OKAY but refuses - # to run and moans httpd: Could not mmap memory .. or similar) set - # this to 'yes'. Rule WANTHSREGEX=default - Rule BADMMAP=default # Module configuration --- 94,101 1.29 +3 -23 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.28 retrieving revision 1.29 diff -C3 -r1.28 -r1.29 *** Configure 1996/10/22 00:03:06 1.28 --- Configure 1996/10/22 04:21:44 1.29 *** *** 1,5 #!/bin/sh ! # $Id: Configure,v 1.28 1996/10/22 00:03:06 jim Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. --- 1,5 #!/bin/sh ! # $Id: Configure,v 1.29 1996/10/22 04:21:44 akosut Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. *** *** 112,118 RULE_WANTHSREGEX=`./CutRule WANTHSREGEX $file` RULE_STATUS=`./CutRule STATUS $file` RULE_SOCKS4=`./CutRule SOCKS4 $file` - RULE_BADMMAP=`./CutRule BADMMAP $file` RULE_IRIXNIS=`./CutRule IRIXNIS $file` # --- 112,117 *** *** 123,129 # options) as required. Setting CC and OPTIM here has no effect # if they were set in Configure. # ! # Also, we set DEF_WANTHSREGEX and DEF_BADMMAP to the appropriate # value for each platform. # # As more PLATFORMs are added to Configuration.tmpl, be sure to --- 122,128 # options) as required. Setting CC and OPTIM here has no effect # if they were set in Configure. # ! # Also, we set DEF_WANTHSREGEX and to the appropriate # value for each platform. # # As more PLATFORMs are added to Configuration.tmpl, be sure to *** *** 143,149 LIBS=$LIBS -lposix -lbsd LFLAGS=$LFLAGS -s DEF_WANTHSREGEX=no - DEF_BADMMAP=no ;; *-ibm-aix*) OS='IBM AIX' --- 142,147 *** *** 172,178 ;; *-sgi-irix*) DEF_WANTHSREGEX=yes - DEF_BADMMAP=no DBM_LIB= if [ $RULE_IRIXNIS = yes ]; then OS='SGI IRIX w/NIS' --- 170,175 *** *** 234,240 LIBS=$LIBS -lsocket -lmalloc -lprot OSBPRINTF=-K noinline DEF_WANTHSREGEX=no - DEF_BADMMAP=no ;; *-solaris2*) OS='Solaris 2' --- 231,236 *** *** 276,282 esac # ! # See if we need to override WANTHSREGEX or BADMMAP # if [ $RULE_WANTHSREGEX = default ]; then if [ x$DEF_WANTHSREGEX = x ]; then --- 272,278 esac # ! # See if we need to override WANTHSREGEX # if [ $RULE_WANTHSREGEX = default ]; then if [
cvs commit: apache/src Configuration.tmpl
ben 96/09/08 06:55:09 Modified:src Configuration.tmpl Log: Whoops. Missed out a small comment. Revision ChangesPath 1.34 +5 -3 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.33 retrieving revision 1.34 diff -C3 -r1.33 -r1.34 *** Configuration.tmpl1996/09/08 13:52:39 1.33 --- Configuration.tmpl1996/09/08 13:55:08 1.34 *** *** 1,4 ! # $Id: Configuration.tmpl,v 1.33 1996/09/08 13:52:39 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should --- 1,4 ! # $Id: Configuration.tmpl,v 1.34 1996/09/08 13:55:08 ben Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should *** *** 84,97 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans httpd: Could not mmap memory .. or similar) set # this to 'yes'. ! # ! # Rule STATUS=yes Rule SOCKS=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for ! # your platform) you may override them here. Rule HSREGEX=default Rule BADMMAP=default --- 84,99 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans httpd: Could not mmap memory .. or similar) set # this to 'yes'. ! Rule STATUS=yes Rule SOCKS=no # The following rules should be set automatically by Configure. However, if # they are not set by Configure (because we don't know the correct value for ! # your platform), or are set incorrectly, you may override them here. ! # If you have to do this, please let us know what you set and what your ! # platform is, by sending mail to [EMAIL PROTECTED] ! Rule HSREGEX=default Rule BADMMAP=default
cvs commit: apache/src Configuration.tmpl Configure INSTALL Makefile.tmpl README TODO alloc.h buff.c buff.h conf.h explain.c explain.h http_bprintf.c http_conf_globals.h http_config.c http_config.h http_core.c http_core.h http_log.c http_log.h http_main.c http_main.h http_protocol.c http_protocol.h http_request.c http_request.h httpd.h md5.h md5c.c mod_access.c mod_actions.c mod_ai_backcompat.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c mod_browser.c mod_cern_meta.c mod_cgi.c mod_cookies.c mod_digest.c mod_dir.c mod_dld.c mod_env.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_negotiation.c mod_rewrite.c mod_rewrite.h mod_status.c mod_userdir.c rfc1413.c rfc1413.h scoreboard.h util.c util_md5.c util_md5.h util_script.c util_script.h
paul96/08/20 04:51:54 Modified:src Configuration.tmpl Configure INSTALL Makefile.tmpl README TODO alloc.h buff.c buff.h conf.h explain.c explain.h http_bprintf.c http_conf_globals.h http_config.c http_config.h http_core.c http_core.h http_log.c http_log.h http_main.c http_main.h http_protocol.c http_protocol.h http_request.c http_request.h httpd.h md5.h md5c.c mod_access.c mod_actions.c mod_ai_backcompat.c mod_alias.c mod_asis.c mod_auth.c mod_auth_anon.c mod_auth_db.c mod_auth_dbm.c mod_auth_msql.c mod_browser.c mod_cern_meta.c mod_cgi.c mod_cookies.c mod_digest.c mod_dir.c mod_dld.c mod_env.c mod_imap.c mod_include.c mod_info.c mod_log_agent.c mod_log_config.c mod_log_referer.c mod_mime.c mod_negotiation.c mod_rewrite.c mod_rewrite.h mod_status.c mod_userdir.c rfc1413.c rfc1413.h scoreboard.h util.c util_md5.c util_md5.h util_script.c util_script.h Log: Added $Id:$ strings Removed blank lines from top of files where necessary. Revision ChangesPath 1.31 +1 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.30 retrieving revision 1.31 diff -C3 -r1.30 -r1.31 *** Configuration.tmpl1996/08/14 17:45:14 1.30 --- Configuration.tmpl1996/08/20 11:50:33 1.31 *** *** 1,3 --- 1,4 + # $Id: Configuration.tmpl,v 1.31 1996/08/20 11:50:33 paul Exp $ # Config file for the Apache httpd. # Configuration.tmpl is the template for Configuration. Configuration should 1.12 +1 -0 apache/src/Configure Index: Configure === RCS file: /export/home/cvs/apache/src/Configure,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** Configure 1996/08/17 17:27:32 1.11 --- Configure 1996/08/20 11:50:34 1.12 *** *** 1,4 --- 1,5 #!/bin/sh + # $Id: Configure,v 1.12 1996/08/20 11:50:34 paul Exp $ trap 'rm $tmpfile; exit' 0 1 2 3 15 # Apache configuration script, first cut --- rst. 1.6 +2 -0 apache/src/INSTALL Index: INSTALL === RCS file: /export/home/cvs/apache/src/INSTALL,v retrieving revision 1.5 retrieving revision 1.6 diff -C3 -r1.5 -r1.6 *** INSTALL 1996/08/05 01:17:22 1.5 --- INSTALL 1996/08/20 11:50:34 1.6 *** *** 1,3 --- 1,5 + $Id: INSTALL,v 1.6 1996/08/20 11:50:34 paul Exp $ + This release of Apache supports the notion of optional modules. However, the server has to know which modules are compiled into it, in order for those modules to be effective; this requires generation of a 1.23 +1 -0 apache/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v retrieving revision 1.22 retrieving revision 1.23 diff -C3 -r1.22 -r1.23 *** Makefile.tmpl 1996/08/05 01:34:25 1.22 --- Makefile.tmpl 1996/08/20 11:50:35 1.23 *** *** 1,3 --- 1,4 + # $Id: Makefile.tmpl,v 1.23 1996/08/20 11:50:35 paul Exp $ # Apache makefile template (well, suffix). # This is combined with the information in the Configuration file 1.15 +2 -0 apache/src/README Index: README === RCS file: /export/home/cvs/apache/src/README,v retrieving revision 1.14 retrieving revision 1.15 diff -C3 -r1.14 -r1.15 *** README1996/08/05 01:17:23 1.14 --- README1996/08/20 11:50:37 1.15 *** *** 1,3 --- 1,5 + $Id: README,v 1.15 1996/08/20 11:50:37 paul Exp $ + The basic idea of the new Apache release is to make a modular tinkertoy server, to which people can easily add code which is valuable to them (even if it isn't universally useful) without hairing 1.13 +2 -0 apache/src/TODO Index: TODO === RCS file: /export/home/cvs/apache/src/TODO,v retrieving revision 1.12 retrieving revision 1.13 diff -C3 -r1.12 -r1.13 *** TODO 1996/08/05 01:17:23 1.12 --- TODO 1996/08/20 11:50:37
cvs commit: apache/src Configuration.tmpl README conf.h
jim 96/07/30 11:24:53 Modified:src Configuration.tmpl README conf.h Log: more cleanup for regex selection Revision ChangesPath 1.24 +3 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.23 retrieving revision 1.24 diff -C3 -r1.23 -r1.24 *** Configuration.tmpl1996/07/29 22:52:00 1.23 --- Configuration.tmpl1996/07/30 18:24:50 1.24 *** *** 80,86 # 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 --- 80,88 # 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). ALSO: If ! # using this _regex_ package, be sure to #define USE_HS_POSIX in conf.h ! # for your platform. #REGLIBS=regex/libregex.a # Default to using ranlib on libraries (for regex). Set this to something else 1.12 +10 -0 apache/src/README Index: README === RCS file: /export/home/cvs/apache/src/README,v retrieving revision 1.11 retrieving revision 1.12 diff -C3 -r1.11 -r1.12 *** README1996/07/29 23:26:44 1.11 --- README1996/07/30 18:24:51 1.12 *** *** 186,191 --- 186,196 HAVE_SYS_SELECT_H: Define if the OS has the sys/select.h header file. + + HAVE_SYS_RESOURCE_H: + Define if the OS has and supports the getrlimit/setrlimit + family. Apache uses this to determine if RLIMIT_CPU|VMEM|DATA|RLIMIT + is found and used. -- USE_*: *** *** 203,208 --- 208,218 USE_LONGJMP: use the longjmp() call instead of siglongjmp() + + USE_HS_REGEX: + Define this (and adjust Configuration as required) if you want + or need to use H. Spencer's POSIX/regex package which is + included. -- NO_*: 1.29 +5 -0 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.28 retrieving revision 1.29 diff -C3 -r1.28 -r1.29 *** conf.h1996/07/27 21:39:45 1.28 --- conf.h1996/07/30 18:24:51 1.29 *** *** 396,402 --- 396,407 #ifndef QNX #include memory.h #endif + + #ifdef USE_HS_REGEX #include regex/regex.h + #else + #include regex.h + #endif #ifdef HAVE_SYS_RESOURCE_H #include sys/resource.h
cvs commit: apache/src Configuration.tmpl Makefile.tmpl README conf.h
jim 96/07/30 12:37:02 Modified:src Configuration.tmpl Makefile.tmpl README conf.h Log: Allow for more logical (yeah, sure) way to add flags Revision ChangesPath 1.25 +27 -17apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.24 retrieving revision 1.25 diff -C3 -r1.24 -r1.25 *** Configuration.tmpl1996/07/30 18:24:50 1.24 --- Configuration.tmpl1996/07/30 19:36:57 1.25 *** *** 39,59 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans httpd: Could not mmap memory .. or similar) try # disabling use of shared memory for process management (scoreboard with ! # -DNO_MMAP # Status Instrumentation # In order for the status module to obtain full statistics Apache must # be modified to keep track of various information. This is not ! # turned on by default. In order to enable full status details add -DSTATUS ! # to the end of the CFLAGS line below. # Using SOCKS # Apache can be compiled to work over a SOCKS firewall by ! # adding the following string to your CFLAGS define: ! # ! # -Dconnect=Rconnect -Dselect=Rselect -Dgethostbyname=Rgethostbyname # ! # and by adding the following to the EXTRA_LIBS define: # # -L/usr/local/lib -lsocks # --- 39,61 # If you find that your OS can't cope with mmap (compiles OKAY but refuses # to run and moans httpd: Could not mmap memory .. or similar) try # disabling use of shared memory for process management (scoreboard with ! # -DNO_MMAP) by uncommenting the line below: ! #NOMMAPCFLAG= -DNO_MMAP # Status Instrumentation # In order for the status module to obtain full statistics Apache must # be modified to keep track of various information. This is not ! # turned on by default. In order to enable full status details uncomment ! # the line below: ! #STATCFLAG= -DSTATUS # Using SOCKS # Apache can be compiled to work over a SOCKS firewall by ! # uncommenting the line below: ! #SOCKSCFLAG= -Dconnect=Rconnect -Dselect=Rselect -Dgethostbyname=Rgethostbyname ! # ! # Also add the following to the EXTRA_LIBS define: # # -L/usr/local/lib -lsocks # *** *** 65,79 # defaults in. Note that this config file does not include DBM auth by # default --- configure it in below if you need it]. ! CFLAGS= -O2 ! ! # Place here any flags you may need upon linking, such as a flag to ! # prevent dynamic linking (if desired) ! LFLAGS= ! # Place here any extra libraries you may need to link to. ! # -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 --- 67,77 # defaults in. Note that this config file does not include DBM auth by # default --- configure it in below if you need it]. ! # What level of optimization? ! OPTMCFLAG= -O2 ! # Add whatever other flags you'd like here... Like, maybe -Wall ! XTRACFLAG= # Apache requires a POSIX regex implementation. Some/most platforms provide # this capability, but for those that don't, Apache provides, simply for *** *** 81,95 # 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). ALSO: If ! # using this _regex_ package, be sure to #define USE_HS_POSIX in conf.h ! # for your platform. #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) RANLIB=ranlib # AUX_CFLAGS are system-specific control flags. # NOTE: IF YOU DO NOT CHOOSE ONE OF THESE, EDIT httpd.h AND CHOOSE # SETTINGS FOR THE SYSTEM FLAGS. IF YOU DON'T, BAD THINGS WILL HAPPEN. --- 79,105 # 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). ALSO: If ! # using this _regex_ package, be sure to also uncomment REGINC as well #REGLIBS=regex/libregex.a + #REGINC= -Iregex # 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) RANLIB=ranlib + # Place here any flags you may
cvs commit: apache/src Configuration.tmpl conf.h rfc1413.c
ben 96/07/16 15:22:11 Modified:src Configuration.tmpl conf.h rfc1413.c Log: HPUX 10 fixes. Revision ChangesPath 1.21 +2 -0 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.20 retrieving revision 1.21 diff -C3 -r1.20 -r1.21 *** Configuration.tmpl1996/06/29 19:59:25 1.20 --- Configuration.tmpl1996/07/16 22:22:08 1.21 *** *** 90,95 --- 90,97 #AUX_LIBS= -lsun # For HP-UX n.b. if you use the paid-for HP CC compiler, use flag -Ae #AUX_CFLAGS= -DHPUX + # For HP-UX 10 + #AUX_CFLAGS= -DHPUX10 # For AIX #AUX_CFLAGS= -DAIX -U__STR__ # For Ultrix 1.20 +3 -1 apache/src/conf.h Index: conf.h === RCS file: /export/home/cvs/apache/src/conf.h,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** conf.h1996/07/16 19:57:25 1.19 --- conf.h1996/07/16 22:22:08 1.20 *** *** 95,101 #define HAVE_CRYPT_H #define NO_LONG_DOUBLE ! #elif defined(HPUX) #define HAVE_RESOURCE #undef HAVE_GMTOFF #define NO_KILLPG --- 95,101 #define HAVE_CRYPT_H #define NO_LONG_DOUBLE ! #elif defined(HPUX) || defined(HPUX10) #define HAVE_RESOURCE #undef HAVE_GMTOFF #define NO_KILLPG *** *** 103,109 --- 103,111 #ifndef _HPUX_SOURCE #define _HPUX_SOURCE #endif + #ifndef HPUX10 #define getwd(d) getcwd(d,MAX_STRING_LEN) + #endif #define JMP_BUF sigjmp_buf #define HAVE_MMAP 1.3 +0 -4 apache/src/rfc1413.c Index: rfc1413.c === RCS file: /export/home/cvs/apache/src/rfc1413.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C3 -r1.2 -r1.3 *** rfc1413.c 1996/04/18 11:18:24 1.2 --- rfc1413.c 1996/07/16 22:22:09 1.3 *** *** 77,86 #include http_log.h /* for log_unixerr */ #include rfc1413.h - #ifndef _HPUX_SOURCE - #define _HPUX_SOURCE - #endif - /* System libraries. */ #include setjmp.h --- 77,82
cvs commit: apache/src Configuration.tmpl
ben 96/06/29 12:59:26 Modified:src Configuration.tmpl Log: Correct spelling mistake in SOCKSification. Revision ChangesPath 1.20 +1 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.19 retrieving revision 1.20 diff -C3 -r1.19 -r1.20 *** Configuration.tmpl1996/06/27 22:35:41 1.19 --- Configuration.tmpl1996/06/29 19:59:25 1.20 *** *** 51,57 # Apache can be compiled to work over a SOCKS firewall by # adding the following string to your CFLAGS define: # ! # -Dconnect=Rconnect -Dselect=Rselect -Dgethstbyname=Rgethostbyname # # and by adding the following to the EXTRA_LIBS define: # --- 51,57 # Apache can be compiled to work over a SOCKS firewall by # adding the following string to your CFLAGS define: # ! # -Dconnect=Rconnect -Dselect=Rselect -Dgethostbyname=Rgethostbyname # # and by adding the following to the EXTRA_LIBS define: #
cvs commit: apache/src Configuration.tmpl
brian 96/06/27 15:35:43 Modified:src Configuration.tmpl Log: Submitted by: Dirk-Willem van Gulik [EMAIL PROTECTED] Added suggestions as to extra CFLAG possibilities if one wishes to use the msql module. Revision ChangesPath 1.19 +6 -1 apache/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v retrieving revision 1.18 retrieving revision 1.19 diff -C3 -r1.18 -r1.19 *** Configuration.tmpl1996/06/26 06:28:28 1.18 --- Configuration.tmpl1996/06/27 22:35:41 1.19 *** *** 243,249 # Module dbm_auth_module mod_auth_dbm.o ## msql_auth checks against an MSQL database. You must have MSQL installed ! ## and an msql.h available for this to even compile. # Module msql_auth_modulemod_auth_msql.o --- 243,254 # Module dbm_auth_module mod_auth_dbm.o ## msql_auth checks against an MSQL database. You must have MSQL installed ! ## and an msql.h available for this to even compile. Additionally, ! ## you may need to add a couple entries to the CFLAGS line, like ! ## ! ## -lmsql -L/usr/local/lib -L/usr/local/Minerva/lib ! ## ! ## This depends on your installation of MSQL. # Module msql_auth_modulemod_auth_msql.o
