cvs commit: apache-1.3/htdocs/manual upgrading_to_1_3.html
brian 98/06/15 17:23:40 Modified:htdocs/manual upgrading_to_1_3.html Log: Cleanup, thanks Alvaro Martinez Echevarria [EMAIL PROTECTED] Revision ChangesPath 1.25 +3 -2 apache-1.3/htdocs/manual/upgrading_to_1_3.html Index: upgrading_to_1_3.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/upgrading_to_1_3.html,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- upgrading_to_1_3.html 1998/05/28 11:50:54 1.24 +++ upgrading_to_1_3.html 1998/06/16 00:23:38 1.25 @@ -72,8 +72,9 @@ H3Run-Time Configuration Changes/H3 UL - LISTRONGSAMPAuthName/SAMP strings may need to be quoted/STRONG -in SAMP.htaccess/SAMP or server configuration files. If you use + LISTRONGSAMPAuthName/SAMP strings will need to be quoted/STRONG +in SAMP.htaccess/SAMP or server configuration files if they contain +blank characters (like spaces). For example, if you use an SAMPAuthName/SAMP directive like this: P PRE
cvs commit: apache-1.3/htdocs/manual/mod core.html mod_proxy.html
brian 98/06/15 19:11:33 Modified:htdocs/manual/mod core.html mod_proxy.html Log: Submitted by: [EMAIL PROTECTED] Reviewed by: Brian Tweak to add some x-references. Revision ChangesPath 1.124 +4 -1 apache-1.3/htdocs/manual/mod/core.html Index: core.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v retrieving revision 1.123 retrieving revision 1.124 diff -u -r1.123 -r1.124 --- core.html 1998/06/08 16:25:36 1.123 +++ core.html 1998/06/16 02:11:30 1.124 @@ -2794,7 +2794,10 @@ similarly, the user should not be able to execute code which is not meant for httpd requests. It is recommended that you set up a new user and group specifically for running the server. Some admins use user -CODEnobody/CODE, but this is not always possible or desirable.P +CODEnobody/CODE, but this is not always possible or desirable. +For example mod_proxy's cache, when enabled, must be accessible to this user +(see the A href=mod_proxy.html#cacherootCODECacheRoot/CODE/a +directive/a).P Notes: If you start the server as a non-root user, it will fail to change to the lesser privileged user, and will instead continue to run as 1.40 +2 -1 apache-1.3/htdocs/manual/mod/mod_proxy.html Index: mod_proxy.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/mod_proxy.html,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- mod_proxy.html1998/06/08 19:05:15 1.39 +++ mod_proxy.html1998/06/16 02:11:31 1.40 @@ -583,7 +583,8 @@ Apache 1.1 and later.P Sets the name of the directory to contain cache files; this must be -writable by the httpd server.BR +writable by the httpd server. +(see the A href=core.html#userCODEUser/CODE/a directive/a).BR Setting CODECacheRoot/CODE enables proxy cacheing; without defining a CODECacheRoot/CODE, proxy functionality will be available if CODEProxyRequests/CODE are set to CODEOn/CODE, but no
cvs commit: apache-1.3/htdocs/manual windows.html
brian 98/06/15 19:40:33 Modified:htdocs/manual windows.html Log: Submitted by: [EMAIL PROTECTED] Reviewed by: Brian More good details added, more work needed... Revision ChangesPath 1.17 +82 -32apache-1.3/htdocs/manual/windows.html Index: windows.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/windows.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- windows.html 1998/05/30 12:18:01 1.16 +++ windows.html 1998/06/16 02:40:32 1.17 @@ -47,6 +47,7 @@ LIA HREF=#runRunning Apache for Windows/A LIA HREF=#useUsing Apache for Windows/A LIA HREF=#cmdlineRunning Apache for Windows from the Command Line/A + LIA HREF=#signalSignalling Apache when running/A LIA HREF=#compCompiling Apache for Windows/A /UL @@ -152,7 +153,7 @@ which should be set before you start really using Apache. However to get started quickly the files should work as installed. -H2A NAME=instRunning Apache for Windows/A/H2 +H2A NAME=runRunning Apache for Windows/A/H2 There are two ways you can run Apache: @@ -161,7 +162,7 @@ you want Apache to automatically start when you machine boots, and to keep Apache running when you log-off. - LIFrom a console window. This is the only option available for + LIFrom a a ref=#cmdlineconsole window/a. This is the only option available for Windows 95 users. /UL @@ -272,32 +273,57 @@ work from the command line. P - When working with Apache it is important to know how it will find the -configuration files. During installation, a registry key will have -been installed. For the 1.3 beta releases the key is: +configuration files. Apache will try one of the following, in this order. -PRE - HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\1.3 beta\ServerRoot -/PRE +ul +liA ServerRoot directive via a -C switch. +liThe -f switch on the command line. +liThe -d switch on the command line. +liA registry entry, created if you did a binary install. +liThe server root compiled into the server. +/ul -While for the final 1.3.0 release it is called: +P +The server root compiled into the server is usually /apache. +invoking apache with the -v switch will display this value +labeled as HTTPD_ROOT. + +P +Your current working directory when Apache is started up has no +effect on Apache's behavior. + +P +Under windows, when invoked from the start menu or the Service Manager Apache is +usually passed no arguments. So using the registry entry is the perfered +technique. +P +During a binary installation, a registry key will have +been installed, for example: PRE HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\1.3.0\ServerRoot /PRE -(The use of different keys lets you install later versions without -affect any previous versions already installed. For example, when -1.3.1 comes out it will use 1.3.1 instead of 1.3.0 in the registry -key, so you can install and test 1.3.1 without affecting you existing -1.3.0 installation. Note however that Windows NT service manager only -ever allows one service with the same name, so you cannot install the -newer version as a service whilst the older version is still -installed). +For the 1.3 beta releases the key was: +PRE + HKEY_LOCAL_MACHINE\Software\Apache Group\Apache\1.3 beta\ServerRoot +/PRE P +This key is compiled into the server and can enable you to test +new versions without affecting the current version. Of course +you must take care not to install the new version on top of the +old version in the file system. You can not run two invocations +of Apache on Windows simultaneously. +P +If you did not do a binary install then Apache will in some +senarios complain that about the missing registry key. This +warning can be ignored if it otherwise was able to find it's +configuration files. + +P The value of this key is the ServerRoot directory, containing the SAMPconf/SAMP directory. When Apache starts it will read the SAMPhttpd.conf/SAMP file from this directory. If this file @@ -309,7 +335,6 @@ directory in the SAMPhttpd.conf/SAMP file to the new location. P - To run Apache from the command line as a console application, use the following command: @@ -317,14 +342,13 @@ apache -s /PRE -(The -s option is not required by Windows 95, but on Windows NT it -prevents Apache waiting to see if Apache is running as a -service). Apache will execute, and will remain running until it -is stopped by pressing control-C. +Apache will execute, and will remain running until it is stopped by pressing +control-C. (The -s option is not required by Windows 95, but on Windows NT it +prevents Apache waiting
cvs commit: apache-1.3/htdocs/manual/misc security_tips.html
brian 98/06/15 20:06:05 Modified:htdocs/manual/misc security_tips.html Log: Update a path, and a mail alias. Revision ChangesPath 1.17 +7 -7 apache-1.3/htdocs/manual/misc/security_tips.html Index: security_tips.html === RCS file: /export/home/cvs/apache-1.3/htdocs/manual/misc/security_tips.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- security_tips.html1998/05/20 14:22:42 1.16 +++ security_tips.html1998/06/16 03:06:04 1.17 @@ -48,10 +48,10 @@ similarly protected: BLOCKQUOTEPRE -cp httpd /usr/local/apache/bin -chown 0 /usr/local/apache/bin/httpd -chgrp 0 /usr/local/apache/bin/httpd -chmod 511 /usr/local/apache/bin/httpd +cp httpd /usr/local/apache/sbin +chown 0 /usr/local/apache/sbin/httpd +chgrp 0 /usr/local/apache/sbin/httpd +chmod 511 /usr/local/apache/sbin/httpd /PRE/BLOCKQUOTE PYou can create an htdocs subdirectory which is modifiable by other @@ -218,9 +218,9 @@ HR PPlease send any other useful security tips to The Apache Group by filling out a -A HREF=http://www.apache.org/bug_report.html;problem report/A, or by -sending mail to -A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/A +A HREF=http://www.apache.org/bug_report.html;problem report/A. +Serious security matters should of course be sent to A HREF=mailto:[EMAIL PROTECTED] [EMAIL PROTECTED]/A. P HR
cvs commit: apache-1.3 STATUS
brian 98/06/15 20:24:04 Modified:.STATUS Log: Some cleanup (prepare for some more commits on their way); also, if Apple wants to make sure Apache 1.3.0 runs well on Rhapsody they can do the work to come up with a patch. I've sent a ping to Wilfredo about this. Revision ChangesPath 1.426 +2 -10 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.425 retrieving revision 1.426 diff -u -r1.425 -r1.426 --- STATUS1998/06/11 15:34:57 1.425 +++ STATUS1998/06/16 03:24:03 1.426 @@ -8,11 +8,9 @@ 1.3.0: Tagged and rolled on June 1. Announced and Released on the 6th. -1.3b7: Tagged and Released 26/5/98. - 2.0 : In pre-alpha development, see apache-2.0 repository -FINAL RELEASE SHOWSTOPPERS: +RELEASE SHOWSTOPPERS: * Ralf: mod_so doesn't correctly initialise modules. For instance the handlers of mod_perl are not initialised. An ap_init_modules() could @@ -23,7 +21,7 @@ there are more modules which have the same problem. This should be fixed for 1.3.1! -WIN32 1.3 FINAL RELEASE SHOWSTOPPERS: +WIN32 1.3 RELEASE SHOWSTOPPERS: * SECURITY: numerous uses of strcpy and strcat have potential for buffer overflow, someone should rewrite or verify @@ -45,12 +43,6 @@ through two new core API functions. [EMAIL PROTECTED] Status: Ralf +1 - -* Wilfredo Sanchez's port to Rhapsody 5.1 for 1.2.6 - forward port to - 1.3? - [EMAIL PROTECTED] - Jim: Hmmm... Rhapsody is not really any longer in Apple's - game-plan. The focus is OS X now. * Ralf's configure generates config.status: A tiny addition for the APACI configure script to provide an easy way
cvs commit: apache-1.3/src CHANGES
brian 98/06/15 20:28:51 Modified:.Makefile.tmpl configure STATUS .cvsignore src CHANGES Log: Submitted by: Ralf S. Engelschall Reviewed by: Jim, Martin, Brian *) Add a tiny but useful goody to APACI's configure script: The generation of a config.status script (as GNU Autoconf does) which remembers the used configure command and hence can be used to restore the configuration by just re-running this script or for remembering the configuration between releases. Revision ChangesPath 1.40 +1 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- Makefile.tmpl 1998/06/09 11:02:20 1.39 +++ Makefile.tmpl 1998/06/16 03:28:44 1.40 @@ -449,6 +449,7 @@ -$(RM) $(SRC)/apaci @$(RM) $(SRC)/.apaci.build.ok -$(RM) Makefile + -$(RM) config.status # clean the standard stuff distclean-std: 1.33 +38 -0 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- configure 1998/06/13 11:24:10 1.32 +++ configure 1998/06/16 03:28:45 1.33 @@ -75,6 +75,7 @@ aux=src/helpers sedsubst=src/.apaci.sedsubst addconf=src/.apaci.addconf +configstatus=config.status ## ## pre-determine runtime modes @@ -237,6 +238,43 @@ fi done IFS=$OIFS + +# create a config status script for restoring +# the configuration via a simple shell script +rm -f $configstatus 2/dev/null +echo #!/bin/sh $configstatus +echo ## $configstatus +echo ## $configstatus -- APACI auto-generated configuration restore script $configstatus +echo ## $configstatus +echo ## Use this shell script to re-run the APACI configure script for $configstatus +echo ## restoring your configuration. Additional parameters can be supplied. $configstatus +echo ## $configstatus +echo $configstatus +for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do +eval val=\\$$var\ +if [ .$val != . ]; then +echo $var=$val |\ +sed -e 's:\([$\\]\):\\\1:g' \ +-e 's:\([A-Z]*=\):\1:' \ +-e 's:$: \\:' $configstatus +fi +done +if [ $# -eq 0 ]; then +echo ./configure $configstatus +else +echo ./configure \\ $configstatus +for arg +do +echo $arg |\ +sed -e 's:\([$\\]\):\\\1:g' \ +-e 's:^::' \ +-e 's:$: \\:' $configstatus +done +fi +echo '$*' $configstatus +echo '' $configstatus +chmod a+x $configstatus ## ## parse argument line options 1.427 +0 -6 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.426 retrieving revision 1.427 diff -u -r1.426 -r1.427 --- STATUS1998/06/16 03:24:03 1.426 +++ STATUS1998/06/16 03:28:45 1.427 @@ -44,12 +44,6 @@ [EMAIL PROTECTED] Status: Ralf +1 -* Ralf's configure generates config.status: - A tiny addition for the APACI configure script to provide an easy way - (like GNU Autoconf) to re-create the configuration - See: http://www.engelschall.com/sw/apache/ [configstatus] - Status (for 1.3.1-dev): Ralf +1, Martin +1, Jim +1 - * Ralf's IfDefine.../IfDefine: This patch adds a useful IfDefine.../IfDefine section to the core module very similar to the existing IfModule...IfModule sections. 1.3 +1 -0 apache-1.3/.cvsignore Index: .cvsignore === RCS file: /export/home/cvs/apache-1.3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore1998/05/07 15:24:42 1.2 +++ .cvsignore1998/06/16 03:28:45 1.3 @@ -1,3 +1,4 @@ Makefile +config.status Makefile.* src.* 1.918 +7 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.917 retrieving revision 1.918 diff -u -r1.917 -r1.918 --- CHANGES 1998/06/15 16:49:11 1.917 +++ CHANGES 1998/06/16 03:28:50 1.918 @@ -22,6 +22,13 @@ in CPU time, instruction cache, and memory usage, particularly for large directories. [Ken Coar] + *) Add
cvs commit: apache-1.3/src/modules/standard mod_autoindex.c
brian 98/06/15 20:40:13 Modified:src/modules/standard mod_autoindex.c Log: shut up gcc's warning. Revision ChangesPath 1.82 +1 -1 apache-1.3/src/modules/standard/mod_autoindex.c Index: mod_autoindex.c === RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- mod_autoindex.c 1998/06/13 15:23:08 1.81 +++ mod_autoindex.c 1998/06/16 03:40:13 1.82 @@ -1009,7 +1009,7 @@ char *s2; struct ent *c1; struct ent *c2; -int result; +int result = 0; int compare_by_string = 1; /*
cvs commit: apache-1.3/src Configuration.tmpl Makefile.tmpl
brian 98/06/15 20:49:57 Modified:.configure STATUS src Configuration.tmpl Makefile.tmpl Log: Submitted by: Ralf Engelschall Reviewed by: Marc, Jim * Ralf's EXTRA_DEPS to add extra dependecies to httpd target This patch adds an EXTRA_DEPS configuration parameter which can be used to add an extra Makefile dependency for the httpd target, for instance to external third-party libraries, etc. Revision ChangesPath 1.34 +3 -3 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- configure 1998/06/16 03:28:45 1.33 +++ configure 1998/06/16 03:49:52 1.34 @@ -229,7 +229,7 @@ # parameter names to the canonical Autoconf-style shell # variable names. OIFS=$IFS IFS=$DIFS -for var in CFLAGS LDFLAGS LIBS INCLUDES; do +for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do eval val=\$EXTRA_$var if [ .$val != . ]; then eval $var=\$val @@ -897,11 +897,11 @@ # generate settings from imported environment variables OIFS=$IFS IFS=$DIFS for var in CC OPTIM CFLAGS CFLAGS_SHLIB LDFLAGS LD_SHLIB LDFLAGS_SHLIB \ - LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB; do + LDFLAGS_SHLIB_EXPORT LIBS INCLUDES RANLIB DEPS; do eval val=\\$$var\; if [ .$val != . ]; then case $var in -CFLAGS|LDFLAGS|LIBS|INCLUDES) +CFLAGS|LDFLAGS|LIBS|INCLUDES|DEPS) echo s%^#*\\(EXTRA_$var=\\).*%\\1$val%g $sedsubst ;; *) 1.429 +0 -7 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.428 retrieving revision 1.429 diff -u -r1.428 -r1.429 --- STATUS1998/06/16 03:37:07 1.428 +++ STATUS1998/06/16 03:49:52 1.429 @@ -59,13 +59,6 @@ See: http://www.engelschall.com/sw/apache/ [libshlib] Status (for 1.3.1-dev): Ralf +1 -* Ralf's EXTRA_DEPS to add extra dependecies to httpd target - This patch adds an EXTRA_DEPS configuration parameter which can be used - to add an extra Makefile dependency for the httpd target, for instance - to external third-party libraries, etc. - See: http://www.engelschall.com/sw/apache/ [extradeps] - Status (for 1.3.1-dev): Ralf +1, Marc +1, Jim +1 - * Paul's patch to add integrated restart/shutdown signalling (Win32) This patch make Apache listen on predictable event names to allow restarts and shutdowns to be initiated. Also adds a new command line 1.105 +5 -0 apache-1.3/src/Configuration.tmpl Index: Configuration.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Configuration.tmpl,v retrieving revision 1.104 retrieving revision 1.105 diff -u -r1.104 -r1.105 --- Configuration.tmpl1998/05/12 12:13:50 1.104 +++ Configuration.tmpl1998/06/16 03:49:56 1.105 @@ -47,10 +47,15 @@ # these for compiling Apache is risky. If you don't want to see Apache dumping # core regularly then at most use -O or -O2. # +# The EXTRA_DEPS can be used to add extra Makefile dependencies to external +# files (for instance third-party libraries) for the httpd target. The effect +# is that httpd is relinked when those files are changed. +# EXTRA_CFLAGS= EXTRA_LDFLAGS= EXTRA_LIBS= EXTRA_INCLUDES= +EXTRA_DEPS= #CC= #OPTIM= 1.97 +1 -1 apache-1.3/src/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.96 retrieving revision 1.97 diff -u -r1.96 -r1.97 --- Makefile.tmpl 1998/05/22 06:56:56 1.96 +++ Makefile.tmpl 1998/06/16 03:49:57 1.97 @@ -23,7 +23,7 @@ @echo ++ If not, you will at least have to touch '@@Configuration@@'. @false -$(TARGET): $(SUBTARGET) +$(TARGET): $(EXTRA_DEPS) $(SUBTARGET) target_static: subdirs modules.o $(CC) -c $(INCLUDES) $(CFLAGS) buildmark.c
cvs commit: apache-1.3/src CHANGES
brian 98/06/15 20:53:47 Modified:src CHANGES Log: Forgot to note this in src/CHANGES. Revision ChangesPath 1.920 +4 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.919 retrieving revision 1.920 diff -u -r1.919 -r1.920 --- CHANGES 1998/06/16 03:37:20 1.919 +++ CHANGES 1998/06/16 03:53:46 1.920 @@ -1,5 +1,9 @@ Changes with Apache 1.3.1 + *) Added an EXTRA_DEPS configuration parameter which can be used + to add an extra Makefile dependency for the httpd target, for instance + to external third-party libraries, etc. + *) Add IfDefine../IfDefine sections to the core module (with same spirit as IfModule../IfModule sections) which can be used to skip or process contained commands dependend of ``-D PARAMETER'' options on the command
cvs commit: apache-1.3/src CHANGES
brian 98/06/15 20:59:11 Modified:.STATUS configure Makefile.tmpl src CHANGES Log: Submitted by: Ralf Reviewed by: Jim, Brian This patch lets APACI's configure script determine more configuration parameters (Group, Port, ServerAdmin, ServerName) via some intelligent tests. Revision ChangesPath 1.430 +0 -8 apache-1.3/STATUS Index: STATUS === RCS file: /export/home/cvs/apache-1.3/STATUS,v retrieving revision 1.429 retrieving revision 1.430 diff -u -r1.429 -r1.430 --- STATUS1998/06/16 03:49:52 1.429 +++ STATUS1998/06/16 03:59:01 1.430 @@ -44,14 +44,6 @@ [EMAIL PROTECTED] Status: Ralf +1 -* Ralf's substitute some more configuration parameters: - This patch lets APACI's configure script determine more configuration - parameters (Group, Port, ServerAdmin, ServerName) via some intelligent - tests to remove some of the classical hurdles for new users when setting - up Apache. - See: http://www.engelschall.com/sw/apache/ [substconfparam] - Status (for 1.3.1-dev): Ralf +1, Jim +1 - * Ralf's linking DSO modules against possible libraries from $(LIBS): This patch is a first step for a more powerful and less restrictive DSO mechanism: We allow DSO modules to be linked against other DSO libraries 1.35 +52 -0 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- configure 1998/06/16 03:49:52 1.34 +++ configure 1998/06/16 03:59:02 1.35 @@ -775,6 +775,54 @@ fi ## +## determine special configuration parameters +## +conf_group=#-1 +if [ .`egrep ^nobody: /etc/group` != . ]; then +conf_group=nobody +fi +conf_port=80 +if [ .`id | grep root` = . ]; then +conf_port=8080 +fi +username=$LOGNAME +if [ .$username = . ]; then +username=$USER +if [ .$username = . ]; then +username=`whoami 2/dev/null | sed -e 's/\n$//'` +if [ .$username = . ]; then +username=`who am i 2/dev/null | cut '-d ' -f1` +if [ .$username = . ]; then +username=unknown +fi +fi +fi +fi +hostname=`uname -n | sed -e 's/\n$//'` +if [ .$hostname = . ]; then +hostname=`hostname | sed -e 's/\n$//'` +if [ .$hostname = . ]; then +hostname=hostname +fi +fi +hostname=`echo $hostname | sed -e 's/\..*//'` +domainname=; +if [ -f /etc/resolv.conf ]; then +domainname=`egrep '^[ ]*domain' /etc/resolv.conf |\ + sed -e 's/.*domain//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^ *//' \ + -e 's/^\.//' -e 's/^/./'` +if [ .$domainname = . ]; then +domainname=`egrep '^[ ]*search' /etc/resolv.conf |\ + sed -e 's/.*search//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^ *//' \ + -e 's/ .*//' -e 's/^\.//' -e 's/^/./'` +fi +fi +conf_serveradmin=[EMAIL PROTECTED] +conf_servername=$hostname$domainname + +## ## determine prefix-relative paths for directories ## because Apache supports them for the -d and -f ## options, the LoadModule directive, etc. @@ -854,6 +902,10 @@ -e [EMAIL PROTECTED]@%$suexec%g \ -e [EMAIL PROTECTED]@%$suexec_caller%g \ -e [EMAIL PROTECTED]@%$suexec_userdir%g \ +-e [EMAIL PROTECTED]@%$conf_group%g \ +-e [EMAIL PROTECTED]@%$conf_port%g \ +-e [EMAIL PROTECTED]@%$conf_serveradmin%g \ +-e [EMAIL PROTECTED]@%$conf_servername%g \ -e [EMAIL PROTECTED]@%$suexec_uidmin%g \ -e [EMAIL PROTECTED]@%$suexec_gidmin%g \ -e [EMAIL PROTECTED]@%$suexec_safepath%g \ 1.41 +10 -0 apache-1.3/Makefile.tmpl Index: Makefile.tmpl === RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- Makefile.tmpl 1998/06/16 03:28:44 1.40 +++ Makefile.tmpl 1998/06/16 03:59:02 1.41 @@ -118,6 +118,12 @@ suexec_gidmin = @suexec_gidmin@ suexec_safepath = @suexec_safepath@ +# some substituted configuration parameters +conf_group = @conf_group@ +conf_port= @conf_port@ +conf_serveradmin = @conf_serveradmin@ +conf_servername = @conf_servername@ + # usage of src/support stuff build-support = @build_support@ install-support = @install_support@ @@ -382,6 +388,10 @@ -e
cvs commit: apache-1.3/src CHANGES
rse 98/06/16 02:42:32 Modified:src CHANGES Log: Add name of bad guy whos responsible for this patch ;-) Revision ChangesPath 1.922 +1 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.921 retrieving revision 1.922 diff -u -r1.921 -r1.922 --- CHANGES 1998/06/16 03:59:08 1.921 +++ CHANGES 1998/06/16 09:42:30 1.922 @@ -8,6 +8,7 @@ *) Added an EXTRA_DEPS configuration parameter which can be used to add an extra Makefile dependency for the httpd target, for instance to external third-party libraries, etc. + [Ralf S. Engelschall] *) Add IfDefine../IfDefine sections to the core module (with same spirit as IfModule../IfModule sections) which can be used to skip or process
cvs commit: apache-1.3 configure
rse 98/06/16 03:29:18 Modified:.configure Log: Merge in some changes between release and local CVS version of my patch Brian applied: - check for nogroup beside nobody, too. - correct space/tabs in sed patterns - cleanup indentation - cleanup ordering of subst vars Revision ChangesPath 1.36 +12 -9 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- configure 1998/06/16 03:59:02 1.35 +++ configure 1998/06/16 10:29:17 1.36 @@ -780,6 +780,9 @@ conf_group=#-1 if [ .`egrep ^nobody: /etc/group` != . ]; then conf_group=nobody +if [ .`egrep ^nogroup: /etc/group` != . ]; then +conf_group=nogroup +fi fi conf_port=80 if [ .`id | grep root` = . ]; then @@ -808,15 +811,15 @@ hostname=`echo $hostname | sed -e 's/\..*//'` domainname=; if [ -f /etc/resolv.conf ]; then -domainname=`egrep '^[ ]*domain' /etc/resolv.conf |\ - sed -e 's/.*domain//' -e 's/^[ ]*//' \ - -e 's/^ *//' -e 's/^ *//' \ +domainname=`egrep '^[ ]*domain' /etc/resolv.conf |\ + sed -e 's/.*domain//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^*//' \ -e 's/^\.//' -e 's/^/./'` if [ .$domainname = . ]; then domainname=`egrep '^[ ]*search' /etc/resolv.conf |\ - sed -e 's/.*search//' -e 's/^[ ]*//' \ - -e 's/^ *//' -e 's/^ *//' \ - -e 's/ .*//' -e 's/^\.//' -e 's/^/./'` + sed -e 's/.*search//' -e 's/^[ ]*//' \ + -e 's/^ *//' -e 's/^*//' \ + -e 's/ .*//' -e 's/^\.//' -e 's/^/./'` fi fi conf_serveradmin=[EMAIL PROTECTED] @@ -902,13 +905,13 @@ -e [EMAIL PROTECTED]@%$suexec%g \ -e [EMAIL PROTECTED]@%$suexec_caller%g \ -e [EMAIL PROTECTED]@%$suexec_userdir%g \ +-e [EMAIL PROTECTED]@%$suexec_uidmin%g \ +-e [EMAIL PROTECTED]@%$suexec_gidmin%g \ +-e [EMAIL PROTECTED]@%$suexec_safepath%g \ -e [EMAIL PROTECTED]@%$conf_group%g \ -e [EMAIL PROTECTED]@%$conf_port%g \ -e [EMAIL PROTECTED]@%$conf_serveradmin%g \ -e [EMAIL PROTECTED]@%$conf_servername%g \ --e [EMAIL PROTECTED]@%$suexec_uidmin%g \ --e [EMAIL PROTECTED]@%$suexec_gidmin%g \ --e [EMAIL PROTECTED]@%$suexec_safepath%g \ -e [EMAIL PROTECTED]@%$build_support%g \ -e [EMAIL PROTECTED]@%$install_support%g \ -e [EMAIL PROTECTED]@%$clean_support%g \
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
coar98/06/16 05:19:45
Modified:src/modules/standard mod_rewrite.c
Log:
More style-guide cleanup (preparatory to some Vary work).
Revision ChangesPath
1.117 +405 -213 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- mod_rewrite.c 1998/06/13 15:23:11 1.116
+++ mod_rewrite.c 1998/06/16 12:19:43 1.117
@@ -265,16 +265,21 @@
* local directives override
* and anything else is inherited
*/
-a-rewriteloglevel = overrides-rewriteloglevel != 0 ?
- overrides-rewriteloglevel :
base-rewriteloglevel;
-a-rewritelogfile = overrides-rewritelogfile != NULL ?
- overrides-rewritelogfile :
base-rewritelogfile;
-a-rewritelogfp= overrides-rewritelogfp != -1 ?
- overrides-rewritelogfp : base-rewritelogfp;
-a-rewritelockfile = overrides-rewritelockfile != NULL ?
- overrides-rewritelockfile :
base-rewritelockfile;
-a-rewritelockfp = overrides-rewritelockfp != -1 ?
- overrides-rewritelockfp : base-rewritelockfp;
+a-rewriteloglevel = overrides-rewriteloglevel != 0
+ ? overrides-rewriteloglevel
+ : base-rewriteloglevel;
+a-rewritelogfile = overrides-rewritelogfile != NULL
+ ? overrides-rewritelogfile
+ : base-rewritelogfile;
+a-rewritelogfp= overrides-rewritelogfp != -1
+ ? overrides-rewritelogfp
+ : base-rewritelogfp;
+a-rewritelockfile = overrides-rewritelockfile != NULL
+ ? overrides-rewritelockfile
+ : base-rewritelockfile;
+a-rewritelockfp = overrides-rewritelockfp != -1
+ ? overrides-rewritelockfp
+ : base-rewritelockfp;
a-rewritemaps = ap_append_arrays(p, overrides-rewritemaps,
base-rewritemaps);
a-rewriteconds= ap_append_arrays(p, overrides-rewriteconds,
@@ -319,14 +324,17 @@
a-rewriteconds= ap_make_array(p, 2, sizeof(rewritecond_entry));
a-rewriterules= ap_make_array(p, 2, sizeof(rewriterule_entry));
-if (path == NULL)
+if (path == NULL) {
a-directory = NULL;
+}
else {
/* make sure it has a trailing slash */
-if (path[strlen(path)-1] == '/')
+if (path[strlen(path)-1] == '/') {
a-directory = ap_pstrdup(p, path);
-else
+ }
+ else {
a-directory = ap_pstrcat(p, path, /, NULL);
+ }
}
return (void *)a;
@@ -336,7 +344,8 @@
{
rewrite_perdir_conf *a, *base, *overrides;
-a = (rewrite_perdir_conf *)ap_pcalloc(p,
sizeof(rewrite_perdir_conf));
+a = (rewrite_perdir_conf *)ap_pcalloc(p,
+ sizeof(rewrite_perdir_conf));
base = (rewrite_perdir_conf *)basev;
overrides = (rewrite_perdir_conf *)overridesv;
@@ -371,13 +380,16 @@
{
rewrite_server_conf *sconf;
-sconf = (rewrite_server_conf *)
-ap_get_module_config(cmd-server-module_config,
rewrite_module);
+sconf =
+(rewrite_server_conf
*)ap_get_module_config(cmd-server-module_config,
+ rewrite_module);
-if (cmd-path == NULL) /* is server command */
+if (cmd-path == NULL) { /* is server command */
sconf-state = (flag ? ENGINE_ENABLED : ENGINE_DISABLED);
-else /* is per-directory command */
+}
+else /* is per-directory command */ {
dconf-state = (flag ? ENGINE_ENABLED : ENGINE_DISABLED);
+}
return NULL;
}
@@ -391,12 +403,14 @@
sconf = (rewrite_server_conf *)
ap_get_module_config(cmd-server-module_config,
rewrite_module);
-if (cmd-path == NULL) /* is server command */
+if (cmd-path == NULL) { /* is server command */
err = cmd_rewriteoptions_setoption(cmd-pool,
(sconf-options), option);
-else /* is per-directory command */
+}
+else { /* is per-directory command */
err = cmd_rewriteoptions_setoption(cmd-pool,
(dconf-options), option);
+}
cvs commit: apache-1.3/src/modules/standard mod_rewrite.c
rse 98/06/16 07:03:39
Modified:src/modules/standard mod_rewrite.c
Log:
Great thanks to Ken for the source style adjustments.
I've now only converted the introduced tabs to spaces as in the
remaining part of the mod_rewrite.c source code for consistency.
Revision ChangesPath
1.118 +149 -149 apache-1.3/src/modules/standard/mod_rewrite.c
Index: mod_rewrite.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_rewrite.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- mod_rewrite.c 1998/06/16 12:19:43 1.117
+++ mod_rewrite.c 1998/06/16 14:03:38 1.118
@@ -266,20 +266,20 @@
* and anything else is inherited
*/
a-rewriteloglevel = overrides-rewriteloglevel != 0
- ? overrides-rewriteloglevel
- : base-rewriteloglevel;
+ ? overrides-rewriteloglevel
+ : base-rewriteloglevel;
a-rewritelogfile = overrides-rewritelogfile != NULL
- ? overrides-rewritelogfile
- : base-rewritelogfile;
+ ? overrides-rewritelogfile
+ : base-rewritelogfile;
a-rewritelogfp= overrides-rewritelogfp != -1
- ? overrides-rewritelogfp
- : base-rewritelogfp;
+ ? overrides-rewritelogfp
+ : base-rewritelogfp;
a-rewritelockfile = overrides-rewritelockfile != NULL
- ? overrides-rewritelockfile
- : base-rewritelockfile;
+ ? overrides-rewritelockfile
+ : base-rewritelockfile;
a-rewritelockfp = overrides-rewritelockfp != -1
- ? overrides-rewritelockfp
- : base-rewritelockfp;
+ ? overrides-rewritelockfp
+ : base-rewritelockfp;
a-rewritemaps = ap_append_arrays(p, overrides-rewritemaps,
base-rewritemaps);
a-rewriteconds= ap_append_arrays(p, overrides-rewriteconds,
@@ -331,10 +331,10 @@
/* make sure it has a trailing slash */
if (path[strlen(path)-1] == '/') {
a-directory = ap_pstrdup(p, path);
- }
- else {
+}
+else {
a-directory = ap_pstrcat(p, path, /, NULL);
- }
+}
}
return (void *)a;
@@ -345,7 +345,7 @@
rewrite_perdir_conf *a, *base, *overrides;
a = (rewrite_perdir_conf *)ap_pcalloc(p,
- sizeof(rewrite_perdir_conf));
+
sizeof(rewrite_perdir_conf));
base = (rewrite_perdir_conf *)basev;
overrides = (rewrite_perdir_conf *)overridesv;
@@ -382,7 +382,7 @@
sconf =
(rewrite_server_conf
*)ap_get_module_config(cmd-server-module_config,
- rewrite_module);
+rewrite_module);
if (cmd-path == NULL) { /* is server command */
sconf-state = (flag ? ENGINE_ENABLED : ENGINE_DISABLED);
@@ -423,7 +423,7 @@
}
else {
return ap_pstrcat(p, RewriteOptions: unknown option ',
- name, '\n, NULL);
+ name, '\n, NULL);
}
return NULL;
}
@@ -497,14 +497,14 @@
new-checkfile = NULL;
if (strcmp(a2+4, tolower) == 0) {
new-func = rewrite_mapfunc_tolower;
- }
+}
else if (strcmp(a2+4, toupper) == 0) {
new-func = rewrite_mapfunc_toupper;
- }
+}
else if (sconf-state == ENGINE_ENABLED) {
return ap_pstrcat(cmd-pool, RewriteMap: internal map not
found:,
a2+4, NULL);
- }
+}
}
else {
new-type = MAPTYPE_TXT;
@@ -515,9 +515,9 @@
new-fpout = -1;
if (new-checkfile (sconf-state == ENGINE_ENABLED)
- (stat(new-checkfile, st) == -1)) {
+ (stat(new-checkfile, st) == -1)) {
return ap_pstrcat(cmd-pool,
- RewriteMap: map file or program not found:,
+ RewriteMap: map file or program not found:,
new-checkfile, NULL);
}
@@ -593,9 +593,9 @@
new-flags = CONDFLAG_NONE;
if (a3 != NULL) {
if ((err = cmd_rewritecond_parseflagfield(cmd-pool,
