cvs commit: apache-site/mirrors mirrors.list index.html
brian 99/01/14 16:20:19 Modified:mirrors mirrors.list index.html Log: New canadian mirror, brazilian mirror active again. Revision ChangesPath 1.69 +2 -1 apache-site/mirrors/mirrors.list Index: mirrors.list === RCS file: /home/cvs/apache-site/mirrors/mirrors.list,v retrieving revision 1.68 retrieving revision 1.69 diff -u -r1.68 -r1.69 --- mirrors.list 1999/01/09 20:13:01 1.68 +++ mirrors.list 1999/01/15 00:20:18 1.69 @@ -6,11 +6,12 @@ http be http://apache.belnet.be/[EMAIL PROTECTED] http be http://apache.digibel.be/ [EMAIL PROTECTED] http bg http://apache.nat.bg/ [EMAIL PROTECTED] -#httpbr http://200.239.56.51/ [EMAIL PROTECTED] +http br http://200.239.56.51/ [EMAIL PROTECTED] http br http://apache.abordo.com.br/[EMAIL PROTECTED] http ca http://www.ccai.com/apache/ [EMAIL PROTECTED] http ca http://micromou.point-net.com/mirror/apache/[EMAIL PROTECTED] http ca http://apache.kawartha.com/ [EMAIL PROTECTED] +http ca http://looking-glass.usask.ca/webmirror/apache/ [EMAIL PROTECTED] http ch http://sunsite.cnlab-switch.ch/www/mirror/apache/ [EMAIL PROTECTED] http cn http://proxy.iinchina.net:8000/ [EMAIL PROTECTED] http cr http://apache.ucr.ac.cr/[EMAIL PROTECTED] 1.57 +4 -0 apache-site/mirrors/index.html Index: index.html === RCS file: /home/cvs/apache-site/mirrors/index.html,v retrieving revision 1.56 retrieving revision 1.57 diff -u -r1.56 -r1.57 --- index.html1999/01/09 20:13:01 1.56 +++ index.html1999/01/15 00:20:18 1.57 @@ -39,6 +39,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://apache.nat.bg/;bg/A - !-- [EMAIL PROTECTED] -- +A HREF=http://200.239.56.51/;br/A - +!-- [EMAIL PROTECTED] -- A HREF=http://apache.abordo.com.br/;br/A - !-- [EMAIL PROTECTED] -- A HREF=http://www.ccai.com/apache/;ca/A - @@ -47,6 +49,8 @@ !-- [EMAIL PROTECTED] -- A HREF=http://apache.kawartha.com/;ca/A - !-- [EMAIL PROTECTED] -- +A HREF=http://looking-glass.usask.ca/webmirror/apache/;ca/A - +!-- [EMAIL PROTECTED] -- A HREF=http://sunsite.cnlab-switch.ch/www/mirror/apache/;ch/A - !-- [EMAIL PROTECTED] -- A HREF=http://proxy.iinchina.net:8000/;cn/A -
cvs commit: apache-1.3/htdocs/manual/vhosts mass.html
brian 99/01/14 16:57:11 Added: htdocs/manual/vhosts mass.html Log: This is the document on how to use mod_rewrite to eliminate the need for virtualhost settings in the config file. Many thanks to Tony Finch [EMAIL PROTECTED] for contributing this! Revision ChangesPath 1.1 apache-1.3/htdocs/manual/vhosts/mass.html Index: mass.html === !DOCTYPE HTML PUBLIC -//W3C//DTD HTML 3.2 Final//EN HTMLHEAD TITLEDynamically configured mass virtual hosting/TITLE /HEAD !-- Background white, links blue (unvisited), navy (visited), red (active) -- BODY BGCOLOR=#FF TEXT=#00 LINK=#FF VLINK=#80 ALINK=#FF !--#include virtual=header.html -- H1 ALIGN=CENTERDynamically configured mass virtual hosting/H1 PThis document describes how to efficiently serve an arbitrary number of virtual hosts with Apache 1.3. Some familiarity with A HREF=../mod/mod_rewrite.htmlCODEmod_rewrite/CODE/A is useful./P !-- Written by Tony Finch ([EMAIL PROTECTED]) ([EMAIL PROTECTED]). Some examples were derived from Ralf S. Engleschall's document http://www.engelschall.com/pw/apache/rewriteguide/ Some suggestions were made by Brian Behlendorf. -- H2A NAME=contentsContents:/A/H2 UL LIA HREF=#motivationMotivation/A LIA HREF=#overviewOverview of the technique/A LIA HREF=#simpleSimple name-based dynamic virtual hosts/A LIA HREF=#homepagesA virtually hosted homepages system/A LIA HREF=#xtra-confUsing a separate virtual host configuration file/A LIA HREF=#combinationsUsing more than one virtual hosting system on the same server/A /UL HRH2A NAME=motivationMotivation/A/H2 PThe techniques described here are of interest if your CODEhttpd.conf/CODE contains hundreds of CODElt;VirtualHostgt;/CODE sections that are substantially the same, for example: PRE NameVirtualHost 111.22.33.44 lt;VirtualHost 111.22.33.44gt; ServerName www.customer-1.com DocumentRoot/www/hosts/www.customer-1.com/docs ScriptAlias /cgi-bin/ /www/hosts/www.customer-1.com/cgi-bin lt;/VirtualHostgt; lt;VirtualHost 111.22.33.44gt; ServerName www.customer-2.com DocumentRoot/www/hosts/www.customer-2.com/docs ScriptAlias /cgi-bin/ /www/hosts/www.customer-2.com/cgi-bin lt;/VirtualHostgt; # blah blah blah lt;VirtualHost 111.22.33.44gt; ServerName www.customer-N.com DocumentRoot/www/hosts/www.customer-N.com/docs ScriptAlias /cgi-bin/ /www/hosts/www.customer-N.com/cgi-bin lt;/VirtualHostgt; /PRE /P PThe basic idea is to replace all of the static CODElt;VirtualHostgt;/CODE configuration with a mechanism that works it out dynamically. This has a number of advantages: OL LIYour configuration file is smaller so Apache starts faster and uses less memory. LIAdding virtual hosts is simply a matter of creating the appropriate directories in the filesystem and entries in the DNS - you don't need to reconfigure or restart Apache. /OL /P PThe main disadvantage is that you cannot have a different log file for each server; however if you have very many virtual hosts then doing this is dubious anyway because it eats file descriptors. It's better to log to a pipe or a fifo and arrange for the process at the other end to distribute the logs (and perhaps accumulate statistics, etc.). A CODELogFormat/CODE directive that includes CODE%v/CODE for the virtual host makes it easy to do this./P HRH2A NAME=overviewOverview of the technique/A/H2 PAll of the dynamic virtual hosts will either be configured as part of the main server configuration, or within a CODElt;VirtualHostgt;/CODE section. For a simple (very uniform) setup, CODElt;VirtualHostgt;/CODE sections aren't needed at all./P PA couple of things need to be `faked' to make the dynamic virtual host look like a normal one. The most important is the server name (configured with CODEServerName/CODE and available to CGIs via the CODESERVER_NAME/CODE environment variable). The way it is determined is controlled by the CODEUseCanonicalName/CODE directive: with CODEUseCanonicalName off/CODE the server name comes from the contents of the CODEHost:/CODE header in the request. If there is no CODEHost:/CODE header then the value configured with CODEServerName/CODE is used instead./P PThe other one is the document root (configured with CODEDocumentRoot/CODE and available to CGIs via the CODEDOCUMENT_ROOT/CODE environment variable). This is used by the core module when mapping URIs to filenames, but in the context of dynamic virtual hosting its value only matters if any CGIs or SSI documents make use of
cvs commit: apache-1.3/src/helpers binbuild.sh findprg.sh
jim 99/01/15 07:01:16 Modified:src/helpers binbuild.sh Removed: src/helpers findprg.sh Log: First step in making binbuild.sh more universal as far as working with all/most shells. Remove the findprg.sh helper since PrintPath works just fine Revision ChangesPath 1.2 +3 -3 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- binbuild.sh 1999/01/05 05:14:52 1.1 +++ binbuild.sh 1999/01/15 15:01:16 1.2 @@ -11,9 +11,9 @@ VER=$(echo $APDIR |sed s/apache-//) OS=$(src/helpers/GuessOS) USER=$(src/helpers/buildinfo.sh -n [EMAIL PROTECTED]) -TAR=$(src/helpers/findprg.sh tar) -GTAR=$(src/helpers/findprg.sh gtar) -GZIP=$(src/helpers/findprg.sh gzip) +TAR=$(src/helpers/PrintPath tar) +GTAR=$(src/helpers/PrintPath gtar) +GZIP=$(src/helpers/PrintPath gzip) CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max if [ ! -f ./ABOUT_APACHE ]
cvs commit: apache-1.3/src/helpers binbuild.sh
jim 99/01/15 07:07:00 Modified:src/helpers binbuild.sh Log: Older shells don't support the newer method of shell execute ( ) Revision ChangesPath 1.3 +8 -7 apache-1.3/src/helpers/binbuild.sh Index: binbuild.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/binbuild.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- binbuild.sh 1999/01/15 15:01:16 1.2 +++ binbuild.sh 1999/01/15 15:06:59 1.3 @@ -7,13 +7,14 @@ # See http://www.apache.org/docs/LICENSE -APDIR=$(basename $(pwd)) -VER=$(echo $APDIR |sed s/apache-//) -OS=$(src/helpers/GuessOS) -USER=$(src/helpers/buildinfo.sh -n [EMAIL PROTECTED]) -TAR=$(src/helpers/PrintPath tar) -GTAR=$(src/helpers/PrintPath gtar) -GZIP=$(src/helpers/PrintPath gzip) +APDIR=`pwd` +APDIR=`basename $APDIR` +VER=`echo $APDIR |sed s/apache-//` +OS=`src/helpers/GuessOS` +USER=`src/helpers/buildinfo.sh -n [EMAIL PROTECTED] +TAR=`src/helpers/PrintPath tar` +GTAR=`src/helpers/PrintPath gtar` +GZIP=`src/helpers/PrintPath gzip` CONFIGPARAM=--with-layout=BinaryDistribution --enable-module=most --enable-shared=max if [ ! -f ./ABOUT_APACHE ]
cvs commit: apache-site/contributors index.html
lars99/01/15 07:55:52 Modified:contributors index.html Log: Now all german group members are located in Munich... :-) Revision ChangesPath 1.61 +4 -4 apache-site/contributors/index.html Index: index.html === RCS file: /home/cvs/apache-site/contributors/index.html,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- index.html1998/12/19 13:30:04 1.60 +++ index.html1999/01/15 15:55:51 1.61 @@ -195,11 +195,11 @@ P STRONGName:/STRONG A NAME=larsLars Eilebrecht/ABR -STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR +STRONGEmail:/STRONG A HREF=mailto:[EMAIL PROTECTED][EMAIL PROTECTED]/ABR STRONGURL:/STRONG A HREF=http://www.home.unix-ag.org/sfx/;http://www.home.unix-ag.org/sfx//ABR -STRONGOrganization:/STRONG German Unix-AG AssociationBR -STRONGOccupation:/STRONG Freelance consultant; writing Apache booksBR -STRONGLocation:/STRONG Kreuztal, GermanyBR +STRONGOrganization:/STRONG ECRC Network Services, MunichBR +STRONGOccupation:/STRONG Internet EngineerBR +STRONGLocation:/STRONG Munich, GermanyBR STRONGComments:/STRONG To err is human, but I can EMreally/EM foul things up.BR STRONGOS Expertise:/STRONG Linux, Solaris, (Digital Unix, AIX, FreeBSD) and AmigaOSBR STRONGContributions:/STRONG Bugs, bug fixes, documentation corrections, binary builds.
cvs commit: apache-1.3/src/modules/standard mod_status.c
jim 99/01/15 09:48:54
Modified:src CHANGES
src/modules/standard mod_status.c
Log:
Some mod_status changes... It's useful to know
both the value of ap_my_generation as well as the generation of each
httpd child process, so we print this out now. Also, '?notable' didn't
print out the vhost info, which didn't make sense to me :)
Revision ChangesPath
1.1213+4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1212
retrieving revision 1.1213
diff -u -r1.1212 -r1.1213
--- CHANGES 1999/01/12 15:46:56 1.1212
+++ CHANGES 1999/01/15 17:48:44 1.1213
@@ -1,5 +1,9 @@
Changes with Apache 1.3.5
+ *) The status module now prints out both the main server generation as
+ well as the generation of each process. Also, the vhost info is
+ printed with '?notable'. [Jim Jagielski]
+
*) Move src/main/md5c.c to src/ap/ap_md5c.c; it's httpd-neutral
and this makes its functions available to things in src/support.
[Ken Coar]
1.105 +24 -12apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- mod_status.c 1999/01/01 19:05:14 1.104
+++ mod_status.c 1999/01/15 17:48:53 1.105
@@ -353,6 +353,7 @@
ap_rvputs(r, Restart Time: ,
ap_ht_time(r-pool, ap_restart_time, DEFAULT_TIME_FORMAT, 0),
br\n, NULL);
+ ap_rprintf(r, Server Generation: %d br\n, (int) ap_my_generation);
ap_rputs(Server uptime: , r);
show_time(r, up_time);
ap_rputs(br\n, r);
@@ -527,11 +528,16 @@
if (!short_report) {
if (no_table_report) {
if (score_record.status == SERVER_DEAD)
- ap_rprintf(r, bServer %d/b (-): %d|%lu|%lu [,
- i, (int) conn_lres, my_lres, lres);
+ ap_rprintf(r,
+ bServer %d-%d/b (-): %d|%lu|%lu [,
+ i, (int) ps_record.generation, (int) conn_lres,
+ my_lres, lres);
else
- ap_rprintf(r, bServer %d/b (%d): %d|%lu|%lu [,
- i, (int) ps_record.pid, (int) conn_lres,
my_lres, lres);
+ ap_rprintf(r,
+ bServer %d-%d/b (%d): %d|%lu|%lu [,
+ i, (int) ps_record.generation,
+ (int) ps_record.pid,
+ (int) conn_lres, my_lres, lres);
switch (score_record.status) {
case SERVER_READY:
@@ -588,17 +594,23 @@
ap_rputs(|, r);
format_byte_out(r, bytes);
ap_rputs()\n, r);
- ap_rprintf(r, i%s {%s}/ibr\n\n,
- score_record.client,
- ap_escape_html(r-pool, score_record.request));
+ ap_rprintf(r, i%s {%s}/i b[%s]/bbr\n\n,
+ score_record.client,
+ ap_escape_html(r-pool, score_record.request),
+ vhost ? vhost-server_hostname : (unavailable));
}
else { /* !no_table_report */
if (score_record.status == SERVER_DEAD)
- ap_rprintf(r,
trtdb%d/btd-td%d/%lu/%lu,
- i, (int) conn_lres, my_lres, lres);
+ ap_rprintf(r,
+ trtdb%d-%d/btd-td%d/%lu/%lu,
+ i, (int) ps_record.generation,
+ (int) conn_lres, my_lres, lres);
else
- ap_rprintf(r,
trtdb%d/btd%dtd%d/%lu/%lu,
- i, (int) ps_record.pid, (int) conn_lres,
my_lres, lres);
+ ap_rprintf(r,
+ trtdb%d-%d/btd%dtd%d/%lu/%lu,
+ i, (int) ps_record.generation,
+ (int) ps_record.pid, (int) conn_lres,
+ my_lres, lres);
switch (score_record.status) {
case SERVER_READY:
@@ -670,7 +682,7 @@
ap_rputs(/table\n \
hr \
table\n \
-trthSrvtdServer number\n \
+trthSrvtdServer number - generation\n \
trthPIDtdOS process ID\n \
cvs commit: apache-1.3 Makefile.tmpl configure
jim 99/01/15 12:06:59
Modified:.Makefile.tmpl configure
Log:
Some configure cleanups and the first attempts at some sort of
universal style.
First of all, we remove the hard-wire of TAR=tar and check to see if
the tar we wind up with supports '-h'.
Secondly, when we do shell string tests, [ .$var != .yes ] looks better
when checking for the string yes, I think it's better if, when checking
for/against a NULL string, we use 'x', eg:
[ x$var != x ]
I'll start adjusting the other shell scripts as well.
Revision ChangesPath
1.63 +4 -3 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===
RCS file: /export/home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.tmpl 1999/01/07 11:50:45 1.62
+++ Makefile.tmpl 1999/01/15 20:06:56 1.63
@@ -79,7 +79,6 @@
CP = cp
LN = ln
RM = rm -f
-TAR = tar
MKDIR = $(TOP)/$(AUX)/mkdir.sh
INSTALL = $(TOP)/$(AUX)/install.sh -c
INSTALL_PROGRAM = $(INSTALL) -s -m 755
@@ -87,6 +86,8 @@
INSTALL_SCRIPT = $(INSTALL) -m 755
INSTALL_DATA= $(INSTALL) -m 644
PERL= @PERL@
+TAR = @TAR@
+TAROPT = @TAROPT@
# installation name of Apache webserver
TARGET = @TARGET@
@@ -367,7 +368,7 @@
echo [PRESERVING EXISTING DATA SUBDIR:
$(root)$(datadir)/htdocs/]; \
else \
echo Copying tree $(TOP)/htdocs/ -
$(root)$(datadir)/htdocs/; \
- (cd $(TOP)/htdocs/ $(TAR) -hcf - *) |\
+ (cd $(TOP)/htdocs/ $(TAR) $(TAROPT) - *) |\
(cd $(root)$(datadir)/htdocs/ $(TAR) -xf -); \
find $(root)$(datadir)/htdocs/ -type d -exec chmod a+rx {} \; ;
\
find $(root)$(datadir)/htdocs/ -type f -exec chmod a+r {} \; ; \
@@ -384,7 +385,7 @@
done; \
fi
@echo Copying tree $(TOP)/icons/ - $(root)$(datadir)/icons/; \
- (cd $(TOP)/icons/ $(TAR) -hcf - *) |\
+ (cd $(TOP)/icons/ $(TAR) $(TAROPT) - *) |\
(cd $(root)$(datadir)/icons/ $(TAR) -xf -); \
find $(root)$(datadir)/icons/ -type d -exec chmod a+rx {} \; ;\
find $(root)$(datadir)/icons/ -type f -exec chmod a+r {} \;
1.68 +43 -20apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- configure 1999/01/02 13:19:41 1.67
+++ configure 1999/01/15 20:06:57 1.68
@@ -119,7 +119,7 @@
##
PERL=no-perl-on-this-system
perlpath=`$aux/PrintPath perl5 perl miniperl`
-if [ .$perlpath != . ]; then
+if [ x$perlpath != x ]; then
PERL=$perlpath
fi
@@ -152,11 +152,32 @@
##
AWK=awk
awkpath=`$aux/PrintPath nawk gawk awk`
-if [ .$awkpath != . ]; then
+if [ x$awkpath != x ]; then
AWK=$awkpath
fi
##
+## Look for a good tar. If we don't find 'GNU tar' then make
+## sure ours can handle the '-h' (don't copy symlink, copy
+## the actual data) option.
+##
+TAR=tar
+tarpath=`$aux/PrintPath gtar gnutar tar`
+if [ x$awkpath != x ]; then
+TAR=$tarpath
+fi
+case `$TAR --version 2/dev/null` in
+*GNU*) TAROPT=-hcf ;;
+*) if $TAR -hcf - Makefile.tmpl /dev/null 21
+ then
+ TAROPT=-hcf
+ else
+ TAROPT=-cf
+ fi
+ ;;
+esac
+
+##
## determine default parameters
##
@@ -237,7 +258,7 @@
OIFS=$IFS IFS=$DIFS
for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do
eval val=\$EXTRA_$var
-if [ .$val != . ]; then
+if [ x$val != x ]; then
eval $var=\$val
eval EXTRA_$var=\\; export EXTRA_$var
echo + Hint: please use $var instead of EXTRA_$var next time
@@ -252,7 +273,7 @@
*--with-layout=* )
;;
* )
-if [ .$* = . ]; then
+if [ x$* = x ]; then
set -- '--with-layout=Apache'
else
set -- '--with-layout=Apache' $@
@@ -272,7 +293,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ .$apc_prev != . ]; then
+if [ x$apc_prev != x ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -412,7 +433,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ .$apc_prev != . ]; then
+if [ x$apc_prev != x ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -465,7 +486,7 @@
echo ## Apache Makefile (shadow wrapper) Makefile
cvs commit: apache-1.3/src Configure
jim 99/01/15 12:32:54
Modified:src Configure
Log:
Found my old System 7 shell book... Looks like this . vs x stuff
isn't needed at all, as long as we wrap both sides in . So, instead
we'll use
$VAR =
or
$VAR = value
and this make it crystal clear.
Revision ChangesPath
1.323 +40 -40apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.322
retrieving revision 1.323
diff -u -r1.322 -r1.323
--- Configure 1999/01/10 07:48:57 1.322
+++ Configure 1999/01/15 20:32:53 1.323
@@ -82,8 +82,8 @@
## Now handle any arguments, which, for now, is -file
## to select an alternate Configuration file
##
-while [ x$1 != x ]; do
- if [ x$1 = x-file ] ; then
+while [ $1 != ]; do
+ if [ $1 = -file ] ; then
shift 1; file=$1; shift 1
if [ ! -r $file ]; then
echo $file does not exist or is not readable.
@@ -143,7 +143,7 @@
using_shlib=`grep '^SharedModule' $tmpfile /dev/null echo 1`
# But perhaps later via apxs when just mod_so is compiled in!
-if [ x$using_shlib = x ]; then
+if [ $using_shlib = ]; then
using_shlib=`grep '^AddModule modules/standard/mod_so.o' $tmpfile
/dev/null echo 1`
fi
@@ -757,7 +757,7 @@
## set this if we haven't
##
-if [ x${MAKE} = x ]; then
+if [ ${MAKE} = ]; then
MAKE='make'; export MAKE
fi
@@ -780,7 +780,7 @@
## And adjust/override WANTHSREGEX as needed
##
if [ $RULE_WANTHSREGEX = default ]; then
- if [ x$DEF_WANTHSREGEX = x ]; then
+ if [ $DEF_WANTHSREGEX = ]; then
RULE_WANTHSREGEX=yes
else
RULE_WANTHSREGEX=$DEF_WANTHSREGEX
@@ -801,8 +801,8 @@
# If $TCC is null, then no such line exists in Configuration
#
TCC=`egrep '^CC=' Makefile.config | tail -1 | awk -F= '{print $2}'`
-if [ x$TCC = x ]; then
-if [ x$CC = x ]; then
+if [ $TCC = ]; then
+if [ $CC = ]; then
# At this point, CC is not set in Configuration or above, so we
# try to find one
for compilers in gcc cc acc c89
@@ -813,7 +813,7 @@
break
fi
done
- if [ x$COMPILER = x ]; then
+ if [ $COMPILER = ]; then
echo Error: could not find any of these C compilers
echo anywhere in your PATH: $lookedfor
echo Configure terminated
@@ -831,7 +831,7 @@
## If there was an entry for it, then set $CC for our own internal
## use.
##
-if [ x$TCC = x ]; then
+if [ $TCC = ]; then
echo CC=$CC Makefile.config
else
CC=$TCC
@@ -841,12 +841,12 @@
## Now check how we can _directly_ run the C pre-processor
##
TCPP=`egrep '^CPP=' Makefile.config | tail -1 | awk -F= '{print $2}'`
-if [ x$TCPP != x ]; then
+if [ $TCPP != ]; then
CPP=`CC=$CC CPP=$TCPP ./helpers/findcpp.sh`
else
CPP=`CC=$CC ./helpers/findcpp.sh`
fi
-if [ x$TCPP = x ]; then
+if [ $TCPP = ]; then
echo CPP=$CPP Makefile.config
fi
echo + setting C pre-processor to $CPP
@@ -912,13 +912,13 @@
## Handle TARGET name
##
-if [ x$TTARGET = x ]; then
+if [ $TTARGET = ]; then
TARGET=httpd
echo TARGET=$TARGET Makefile.config
else
TARGET=$TTARGET
fi
-if [ x$TARGET != xhttpd ]; then
+if [ $TARGET != httpd ]; then
echo + using custom target name: $TARGET
CFLAGS=$CFLAGS -DTARGET=\\\$TARGET\\\
fi
@@ -927,7 +927,7 @@
## We adjust now CFLAGS_SHLIB, LDFLAGS_SHLIB and LDFLAGS_SHLIB_EXPORT as
## required. For more platforms just add the required lines below.
##
-if [ x$using_shlib = x1 ] ; then
+if [ $using_shlib = 1 ] ; then
LD_SHLIB=ld
DEF_SHARED_CORE=no
DEF_SHARED_CHAIN=no
@@ -956,7 +956,7 @@
CFLAGS_SHLIB=-fpic
LDFLAGS_SHLIB=-Bshareable
OBJFORMAT=`test -x /usr/bin/objformat /usr/bin/objformat || echo
aout`
- if [ x$OBJFORMAT = xelf ]; then
+ if [ $OBJFORMAT = elf ]; then
LDFLAGS_SHLIB_EXPORT=-Wl,-E
SHLIB_SUFFIX_DEPTH=0
else
@@ -1170,9 +1170,9 @@
break
fi
done
- if [ x$PERL != x ]; then
+ if [ $PERL != ]; then
# cool, Perl is installed on this platform...
- if [ x`$PERL -V:dlsrc 2/dev/null | grep dlopen` != x ];
then
+ if [ `$PERL -V:dlsrc 2/dev/null | grep dlopen` != ]; then
# ...and actually uses the dlopen-style interface,
# so we can guess the flags from its knowledge
cvs commit: apache-1.3 configure
jim 99/01/15 12:44:03
Modified:.configure
Log:
More style changes
Revision ChangesPath
1.69 +54 -54apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- configure 1999/01/15 20:06:57 1.68
+++ configure 1999/01/15 20:44:01 1.69
@@ -96,7 +96,7 @@
##
## display version information
##
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
APV=`cat $src/include/httpd.h |\
grep #define SERVER_BASEVERSION |\
sed -e 's/^[^]*//' -e 's/.*$//' -e 's/^Apache\///'`
@@ -119,7 +119,7 @@
##
PERL=no-perl-on-this-system
perlpath=`$aux/PrintPath perl5 perl miniperl`
-if [ x$perlpath != x ]; then
+if [ $perlpath != ]; then
PERL=$perlpath
fi
@@ -131,9 +131,9 @@
##
SEO='' # CHANGE THIS VARIABLE HERE IF YOU HAVE PROBLEMS WITH ECHO!
bytes=`echo $SEO '\1' | wc -c | awk '{ printf(%s, $1); }'`
-if [ .$bytes != .3 ]; then
+if [ $bytes != 3 ]; then
bytes=`echo -E '\1' | wc -c | awk '{ printf(%s, $1); }'`
-if [ .$bytes != .3 ]; then
+if [ $bytes != 3 ]; then
echo + Warning: Your 'echo' command is slightly broken.
echo + It interprets escape sequences per default. We already
echo + tried 'echo -E' but had no real success. If errors occur
@@ -152,7 +152,7 @@
##
AWK=awk
awkpath=`$aux/PrintPath nawk gawk awk`
-if [ x$awkpath != x ]; then
+if [ $awkpath != ]; then
AWK=$awkpath
fi
@@ -163,7 +163,7 @@
##
TAR=tar
tarpath=`$aux/PrintPath gtar gnutar tar`
-if [ x$awkpath != x ]; then
+if [ $awkpath != ]; then
TAR=$tarpath
fi
case `$TAR --version 2/dev/null` in
@@ -245,7 +245,7 @@
eval shared_$module=$share
modules=${modules}:$module
modulelist=${modulelist}:$module=$add
-if [ .$share = .yes ]; then
+if [ $share = yes ]; then
modulelist=${modulelist}*
fi
done
@@ -258,7 +258,7 @@
OIFS=$IFS IFS=$DIFS
for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do
eval val=\$EXTRA_$var
-if [ x$val != x ]; then
+if [ $val != ]; then
eval $var=\$val
eval EXTRA_$var=\\; export EXTRA_$var
echo + Hint: please use $var instead of EXTRA_$var next time
@@ -273,7 +273,7 @@
*--with-layout=* )
;;
* )
-if [ x$* = x ]; then
+if [ $* = ]; then
set -- '--with-layout=Apache'
else
set -- '--with-layout=Apache' $@
@@ -293,7 +293,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ x$apc_prev != x ]; then
+if [ $apc_prev != ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -366,7 +366,7 @@
exit 0
;;
--with-layout=*|--compat)
-if [ .$apc_option = .--compat ]; then
+if [ $apc_option = --compat ]; then
apc_optarg=Apache
fi
case $apc_optarg in
@@ -408,11 +408,11 @@
done
IFS=$OIFS
rm -f $pldconf 2/dev/null
-if [ .$prefix = .UNSET ]; then
+if [ $prefix = UNSET ]; then
echo configure:Error: Path layout definition not found or
incorrect 12
exit 1
fi
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
echo + using installation path layout: $name ($file)
fi
with_layout=1
@@ -433,7 +433,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ x$apc_prev != x ]; then
+if [ $apc_prev != ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -461,7 +461,7 @@
case $apc_option in
--shadow=*)
shadow=$apc_optarg
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
echo + creating external package shadow tree
($shadow)
fi
rm -rf $shadow 2/dev/null
@@ -469,7 +469,7 @@
for file in $mkf $sedsubst $addconf $tplconf $pldconf
$configstatus; do
rm -f $shadow/$file 2/dev/null
done
-if [ .$quiet = .no ]; then
+if [ $quiet = no ]; then
echo + switching to external package shadow tree
($shadow)
fi
cd $shadow
@@ -479,14 +479,14 @@
gnutriple=`$aux/GuessOS | sed -e
cvs commit: apache-1.3/src/helpers GuessOS PrintPath TestCompile binbuild.sh buildinfo.sh checkheader.sh find-dbm-lib findcpp.sh fmn.sh fp2rp install.sh mkshadow.sh ppl.sh slo.sh
jim 99/01/15 12:59:46
Modified:.configure
src Configure
src/helpers GuessOS PrintPath TestCompile binbuild.sh
buildinfo.sh checkheader.sh find-dbm-lib findcpp.sh
fmn.sh fp2rp install.sh mkshadow.sh ppl.sh slo.sh
Log:
Final phase of shell programming style consistancy check.
Revision ChangesPath
1.70 +7 -7 apache-1.3/configure
Index: configure
===
RCS file: /export/home/cvs/apache-1.3/configure,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- configure 1999/01/15 20:44:01 1.69
+++ configure 1999/01/15 20:59:34 1.70
@@ -1157,7 +1157,7 @@
name=`echo $rule | tr a-z A-Z`
eval val=\$rule_$rule
echo $SEO s%^\\(Rule $name=\\).*%\\1$val%g $sedsubst
-if [ $verbose = yes ]; then
+if [ $verbose = yes ]; then
echo + Rule $name=$val
fi
done
@@ -1168,13 +1168,13 @@
OIFS=$IFS IFS=':'
for module in $modules; do
eval share=\$shared_$module
-if [ $share = yes ]; then
+if [ $share = yes ]; then
some_shares=1
fi
done
IFS=$OIFS
-if [ $some_shares = 1 ]; then
-if [ $module_so = no ]; then
+if [ $some_shares = 1 ]; then
+if [ $module_so = no ]; then
module_so=yes
if [ $quiet = no ]; then
echo + enabling mod_so for DSO support
@@ -1263,7 +1263,7 @@
OIFS=$IFS IFS=':'
for module in $modules; do
eval add=\$module_$module
-if [ $add = yes ]; then
+if [ $add = yes ]; then
echo $SEO s%^.*\\(AddModule.*[_b/]$module\\..*\\)%\\1%g $sedsubst
echo $SEO s%^.*\\(SharedModule.*[_b/]$module\\..*\\)%\\1%g
$sedsubst
m=yes [static]
@@ -1273,11 +1273,11 @@
m=no
fi
eval share=\$shared_$module
-if [ $share = yes ]; then
+if [ $share = yes ]; then
echo $SEO
s%^\\(.*\\)AddModule\\(.*[_b/]$module\\.\\)[oam].*\\(.*\\)%\\1SharedModule\\2so\\3%g
$sedsubst
m=yes [shared]
fi
-if [ $verbose = yes ]; then
+if [ $verbose = yes ]; then
echo + Module $module: $m
fi
done
1.324 +1 -1 apache-1.3/src/Configure
Index: Configure
===
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- Configure 1999/01/15 20:32:53 1.323
+++ Configure 1999/01/15 20:59:36 1.324
@@ -172,7 +172,7 @@
## that the user was using the old default root directory
## and issue a notice about it.
##
-if [ $file != Configuration.apaci ]
+if [ $file != Configuration.apaci ]
then
if [ -d /usr/local/etc/httpd/ ]
then
1.55 +3 -3 apache-1.3/src/helpers/GuessOS
Index: GuessOS
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/GuessOS,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- GuessOS 1999/01/09 14:24:52 1.54
+++ GuessOS 1999/01/15 20:59:38 1.55
@@ -22,7 +22,7 @@
#
# We need to work around FreeBSD 1.1.5.1
XREL=`uname -X 2/dev/null | grep ^Release | awk '{print $3}'`
-if [ x$XREL != x ]; then
+if [ $XREL != ]; then
if [ -f /etc/kconfig ]; then
case $XREL in
4.0|4.1)
@@ -38,9 +38,9 @@
echo whatever-whatever-sco5; exit 0
;;
4.2MP)
- if [ x$VERSION = x2.1.1 ]; then
+ if [ $VERSION = 2.1.1 ]; then
echo ${MACHINE}-whatever-unixware211; exit 0
- elif [ x$VERSION = x2.1.2 ]; then
+ elif [ $VERSION = 2.1.2 ]; then
echo ${MACHINE}-whatever-unixware212; exit 0
else
echo ${MACHINE}-whatever-unixware2; exit 0
1.15 +1 -1 apache-1.3/src/helpers/PrintPath
Index: PrintPath
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/PrintPath,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- PrintPath 1998/12/02 14:03:31 1.14
+++ PrintPath 1999/01/15 20:59:38 1.15
@@ -49,7 +49,7 @@
# if test/[] knows about -x, which is the prefered flag.
##
-if [ x$os = xOS/2 ]
+if [ $os = OS/2 ]
then
ext=.exe
pathname=`echo -E $pathname |
1.23 +4 -4 apache-1.3/src/helpers/TestCompile
Index: TestCompile
===
RCS file: /export/home/cvs/apache-1.3/src/helpers/TestCompile,v
retrieving revision 1.22
retrieving revision 1.23
diff -u
cvs commit: apache-1.3/src CHANGES
jim 99/01/15 13:04:23 Modified:src CHANGES Log: Document the style changes :/ Revision ChangesPath 1.1214+5 -0 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1213 retrieving revision 1.1214 diff -u -r1.1213 -r1.1214 --- CHANGES 1999/01/15 17:48:44 1.1213 +++ CHANGES 1999/01/15 21:04:16 1.1214 @@ -1,5 +1,10 @@ Changes with Apache 1.3.5 + *) Shell script style now consistant. For shell string equality tests, + we used to have several different styles to work around old shells. + It's now formally (eg): if [ $var = value ] (ie: both sides are + wrapped in dbl-quotes). [Jim Jagielski] + *) The status module now prints out both the main server generation as well as the generation of each process. Also, the vhost info is printed with '?notable'. [Jim Jagielski]
cvs commit: apache-1.3/src/helpers buildinfo.sh
rse 99/01/15 13:47:15 Modified:src/helpers buildinfo.sh Log: Be careful: | : ./configure | Configuring for Apache, Version 1.3.5-dev | + Warning: Configuring Apache with default settings. | + This is probably not what you really want. | + Please read the README.configure and INSTALL files | + first or at least run './configure --help' for | + a compact summary of available options. | + using installation path layout: Apache (config.layout) | [: syntax error | [: syntax error | Creating Makefile So put back some prefix inside the test args here... Revision ChangesPath 1.4 +1 -1 apache-1.3/src/helpers/buildinfo.sh Index: buildinfo.sh === RCS file: /home/cvs/apache-1.3/src/helpers/buildinfo.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- buildinfo.sh 1999/01/15 20:59:39 1.3 +++ buildinfo.sh 1999/01/15 21:47:14 1.4 @@ -16,7 +16,7 @@ if [ $# -ne 1 -a $# -ne 2 ]; then error=yes fi -if [ $# -eq 2 -a $1 != -n ]; then +if [ $# -eq 2 -a x$1 != x-n ]; then error=yes fi if [ $error = yes ]; then
cvs commit: apache-1.3/src/helpers slo.sh
jim 99/01/15 14:25:15 Modified:.configure src CHANGES Configure src/helpers slo.sh Log: Add Ben's suggestions Revision ChangesPath 1.71 +1 -1 apache-1.3/configure Index: configure === RCS file: /export/home/cvs/apache-1.3/configure,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- configure 1999/01/15 20:59:34 1.70 +++ configure 1999/01/15 22:25:10 1.71 @@ -366,7 +366,7 @@ exit 0 ;; --with-layout=*|--compat) -if [ $apc_option = --compat ]; then +if [ x$apc_option = x--compat ]; then apc_optarg=Apache fi case $apc_optarg in 1.1215+3 -1 apache-1.3/src/CHANGES Index: CHANGES === RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.1214 retrieving revision 1.1215 diff -u -r1.1214 -r1.1215 --- CHANGES 1999/01/15 21:04:16 1.1214 +++ CHANGES 1999/01/15 22:25:11 1.1215 @@ -3,7 +3,9 @@ *) Shell script style now consistant. For shell string equality tests, we used to have several different styles to work around old shells. It's now formally (eg): if [ $var = value ] (ie: both sides are - wrapped in dbl-quotes). [Jim Jagielski] + wrapped in dbl-quotes). There is one exception: if value + has a leading - then it should be [ x$var = x-value ]. + [Jim Jagielski] *) The status module now prints out both the main server generation as well as the generation of each process. Also, the vhost info is 1.325 +1 -1 apache-1.3/src/Configure Index: Configure === RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.324 retrieving revision 1.325 diff -u -r1.324 -r1.325 --- Configure 1999/01/15 20:59:36 1.324 +++ Configure 1999/01/15 22:25:12 1.325 @@ -83,7 +83,7 @@ ## to select an alternate Configuration file ## while [ $1 != ]; do - if [ $1 = -file ] ; then + if [ x$1 = x-file ] ; then shift 1; file=$1; shift 1 if [ ! -r $file ]; then echo $file does not exist or is not readable. 1.4 +1 -1 apache-1.3/src/helpers/slo.sh Index: slo.sh === RCS file: /export/home/cvs/apache-1.3/src/helpers/slo.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- slo.sh1999/01/15 20:59:42 1.3 +++ slo.sh1999/01/15 22:25:14 1.4 @@ -27,7 +27,7 @@ optprev='' fi # remember options for arg when used stand-alone -if [ $opt = -L -o $opt = -l ]; then +if [ x$opt = x-L -o x$opt = x-l ]; then optprev=$opt continue; fi
cvs commit: apache-1.3/src/helpers GuessOS PrintPath TestCompile binbuild.sh buildinfo.sh checkheader.sh find-dbm-lib findcpp.sh fmn.sh fp2rp install.sh mkshadow.sh ppl.sh slo.sh
dgaudet 99/01/15 14:40:01
Modified:.configure
src CHANGES Configure
src/helpers GuessOS PrintPath TestCompile binbuild.sh
buildinfo.sh checkheader.sh find-dbm-lib findcpp.sh
fmn.sh fp2rp install.sh mkshadow.sh ppl.sh slo.sh
Log:
Back out jim's recent x/. change. This is a veto and I've given
reasons in new-httpd.
Revision ChangesPath
1.72 +60 -60apache-1.3/configure
Index: configure
===
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- configure 1999/01/15 22:25:10 1.71
+++ configure 1999/01/15 22:39:50 1.72
@@ -96,7 +96,7 @@
##
## display version information
##
-if [ $quiet = no ]; then
+if [ .$quiet = .no ]; then
APV=`cat $src/include/httpd.h |\
grep #define SERVER_BASEVERSION |\
sed -e 's/^[^]*//' -e 's/.*$//' -e 's/^Apache\///'`
@@ -119,7 +119,7 @@
##
PERL=no-perl-on-this-system
perlpath=`$aux/PrintPath perl5 perl miniperl`
-if [ $perlpath != ]; then
+if [ x$perlpath != x ]; then
PERL=$perlpath
fi
@@ -131,9 +131,9 @@
##
SEO='' # CHANGE THIS VARIABLE HERE IF YOU HAVE PROBLEMS WITH ECHO!
bytes=`echo $SEO '\1' | wc -c | awk '{ printf(%s, $1); }'`
-if [ $bytes != 3 ]; then
+if [ .$bytes != .3 ]; then
bytes=`echo -E '\1' | wc -c | awk '{ printf(%s, $1); }'`
-if [ $bytes != 3 ]; then
+if [ .$bytes != .3 ]; then
echo + Warning: Your 'echo' command is slightly broken.
echo + It interprets escape sequences per default. We already
echo + tried 'echo -E' but had no real success. If errors occur
@@ -152,7 +152,7 @@
##
AWK=awk
awkpath=`$aux/PrintPath nawk gawk awk`
-if [ $awkpath != ]; then
+if [ x$awkpath != x ]; then
AWK=$awkpath
fi
@@ -163,7 +163,7 @@
##
TAR=tar
tarpath=`$aux/PrintPath gtar gnutar tar`
-if [ $awkpath != ]; then
+if [ x$awkpath != x ]; then
TAR=$tarpath
fi
case `$TAR --version 2/dev/null` in
@@ -245,7 +245,7 @@
eval shared_$module=$share
modules=${modules}:$module
modulelist=${modulelist}:$module=$add
-if [ $share = yes ]; then
+if [ .$share = .yes ]; then
modulelist=${modulelist}*
fi
done
@@ -258,7 +258,7 @@
OIFS=$IFS IFS=$DIFS
for var in CFLAGS LDFLAGS LIBS INCLUDES DEPS; do
eval val=\$EXTRA_$var
-if [ $val != ]; then
+if [ x$val != x ]; then
eval $var=\$val
eval EXTRA_$var=\\; export EXTRA_$var
echo + Hint: please use $var instead of EXTRA_$var next time
@@ -273,7 +273,7 @@
*--with-layout=* )
;;
* )
-if [ $* = ]; then
+if [ x$* = x ]; then
set -- '--with-layout=Apache'
else
set -- '--with-layout=Apache' $@
@@ -293,7 +293,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ $apc_prev != ]; then
+if [ x$apc_prev != x ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -408,11 +408,11 @@
done
IFS=$OIFS
rm -f $pldconf 2/dev/null
-if [ $prefix = UNSET ]; then
+if [ .$prefix = .UNSET ]; then
echo configure:Error: Path layout definition not found or
incorrect 12
exit 1
fi
-if [ $quiet = no ]; then
+if [ .$quiet = .no ]; then
echo + using installation path layout: $name ($file)
fi
with_layout=1
@@ -433,7 +433,7 @@
for apc_option
do
# if previous option needs an argument, assign it.
-if [ $apc_prev != ]; then
+if [ x$apc_prev != x ]; then
eval $apc_prev=\$apc_option
apc_prev=
continue
@@ -461,7 +461,7 @@
case $apc_option in
--shadow=*)
shadow=$apc_optarg
-if [ $quiet = no ]; then
+if [ .$quiet = .no ]; then
echo + creating external package shadow tree
($shadow)
fi
rm -rf $shadow 2/dev/null
@@ -469,7 +469,7 @@
for file in $mkf $sedsubst $addconf $tplconf $pldconf
$configstatus; do
rm -f $shadow/$file 2/dev/null
done
-if [ $quiet = no ]; then
+if [ .$quiet = .no ]; then
echo + switching to external package shadow tree
($shadow)
fi
cd $shadow
@@ -479,14 +479,14 @@
