You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2001/08/29 15:32:07 UTC
cvs commit: apache-1.3/conf highperformance.conf-dist httpd.conf-dist httpd.conf-dist-nw httpd.conf-dist-win
martin 01/08/29 06:32:07
Modified: src CHANGES
. Makefile.tmpl config.layout configure
conf highperformance.conf-dist httpd.conf-dist
httpd.conf-dist-nw httpd.conf-dist-win
Log:
Parallel to a change in Apache-2.0, the manual directory was moved out of
the DocumentRoot tree to simplify the separation of private
content&configuration from server's on-line documentation. An "Alias
/manual/ ..." projects the manual/ directory (which resides now
side-by-side with the icons/ directory) into the logical DocumentRoot.
Note that a request to http://server/manual (without the trailing slash)
will now behave different than before (it used to redirect to
http://server/manual/ but no longer does).
Revision Changes Path
1.1701 +11 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1700
retrieving revision 1.1701
diff -u -r1.1700 -r1.1701
--- CHANGES 2001/08/21 20:25:10 1.1700
+++ CHANGES 2001/08/29 13:32:06 1.1701
@@ -1,5 +1,16 @@
Changes with Apache 1.3.21
+ *) Parallel to a change in Apache-2.0, the manual directory was
+ moved out of the DocumentRoot tree to simplify the separation
+ of private content&configuration from server's on-line
+ documentation. An "Alias /manual/ ..." projects the manual/
+ directory (which resides now side-by-side with the icons/
+ directory) into the logical DocumentRoot. Note that a request
+ to http://server/manual (without the trailing slash) will now
+ behave different than before (it used to redirect to
+ http://server/manual/ but no longer does).
+ [Martin Kraemer]
+
*) Fixed ap_os_canonical_filename() so that it wouldn't try to
canonicalize an invalid file name. Also fixed
ap_os_is_path_absolute() so that it wouldn't recognize names
1.100 +13 -3 apache-1.3/Makefile.tmpl
Index: Makefile.tmpl
===================================================================
RCS file: /home/cvs/apache-1.3/Makefile.tmpl,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- Makefile.tmpl 2001/01/15 16:26:17 1.99
+++ Makefile.tmpl 2001/08/29 13:32:07 1.100
@@ -120,6 +120,7 @@
datadir = @datadir@
iconsdir = @iconsdir@
htdocsdir = @htdocsdir@
+manualdir = @manualdir@
cgidir = @cgidir@
includedir = @includedir@
localstatedir = @localstatedir@
@@ -270,6 +271,7 @@
$(MKDIR) $(root)$(mandir)/man8
$(MKDIR) $(root)$(sysconfdir)
$(MKDIR) $(root)$(htdocsdir)
+ $(MKDIR) $(root)$(manualdir)
$(MKDIR) $(root)$(iconsdir)
$(MKDIR) $(root)$(cgidir)
$(MKDIR) $(root)$(includedir)
@@ -459,13 +461,20 @@
echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(htdocsdir)/]"; \
else \
echo "Copying tree $(TOP)/htdocs/ -> $(root)$(htdocsdir)/"; \
- (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - *) |\
+ (cd $(TOP)/htdocs/ && $(TAR) $(TAROPT) - index* apache_pb.* ) |\
(cd $(root)$(htdocsdir)/ && $(TAR) -xf -); \
find $(root)$(htdocsdir)/ -type d -exec chmod a+rx {} \; ; \
- find $(root)$(htdocsdir)/ -type f -exec chmod a+r {} \; ; \
+ find $(root)$(htdocsdir)/ -type f -print | xargs chmod a+r ; \
fi
+ -@if [ -d $(TOP)/htdocs/manual ]; then \
+ echo "Copying tree $(TOP)/htdocs/manual -> $(root)/$(manualdir)/"; \
+ (cd $(TOP)/htdocs/manual/ && $(TAR) $(TAROPT) - *) |\
+ (cd $(root)$(manualdir)/ && $(TAR) -xf -); \
+ find $(root)$(manualdir)/ -type d -exec chmod a+rx {} \; ; \
+ find $(root)$(manualdir)/ -type f -print | xargs chmod a+r ; \
+ fi
-@if [ -f $(root)$(cgidir)/printenv ]; then \
- echo "[PRESERVING EXISTING DATA SUBDIR: $(root)$(cgidir)/]"; \
+ echo "[PRESERVING EXISTING CGI SUBDIR: $(root)$(cgidir)/]"; \
else \
for script in printenv test-cgi; do \
cat $(TOP)/cgi-bin/$${script} |\
@@ -504,6 +513,7 @@
cat $(TOP)/conf/$${conf}-dist ) |\
sed -e '/# LoadModule/r $(TOP)/$(SRC)/.apaci.install.conf' \
-e 's;@@ServerRoot@@/htdocs;$(htdocsdir);' \
+ -e 's;@@ServerRoot@@/manual;$(manualdir);' \
-e 's;@@ServerRoot@@/icons;$(iconsdir);' \
-e 's;@@ServerRoot@@/cgi-bin;$(cgidir);' \
-e 's;@@ServerRoot@@/proxy;$(proxycachedir);' \
1.17 +8 -0 apache-1.3/config.layout
Index: config.layout
===================================================================
RCS file: /home/cvs/apache-1.3/config.layout,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- config.layout 2000/11/22 00:38:11 1.16
+++ config.layout 2001/08/29 13:32:07 1.17
@@ -21,6 +21,7 @@
datadir: $prefix
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $prefix/include
localstatedir: $prefix
@@ -42,6 +43,7 @@
datadir: $prefix/share+
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $prefix/include+
localstatedir: $prefix/var+
@@ -142,6 +144,7 @@
datadir: $prefix/share
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $prefix/include
localstatedir: /var$prefix
@@ -162,6 +165,7 @@
datadir: $prefix
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $prefix/include
localstatedir: $prefix
@@ -182,6 +186,7 @@
datadir: /usr/local/httpd
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $prefix/include/apache
localstatedir: /var
@@ -202,6 +207,7 @@
datadir: $prefix
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $exec_prefix/include/apache
localstatedir: /var
@@ -222,6 +228,7 @@
datadir: /var/apache
iconsdir: $datadir/icons
htdocsdir: $datadir/htdocs
+ manualdir: $datadir/manual
cgidir: $datadir/cgi-bin
includedir: $exec_prefix/include
localstatedir: $prefix
@@ -242,6 +249,7 @@
datadir: $prefix
iconsdir: $prefix/icons
htdocsdir: $prefix/htdocs
+ manualdir: $prefix/manual
cgidir: $prefix/cgi-bin
includedir: $exec_prefix/lib/apache/include
localstatedir: $prefix
1.132 +15 -7 apache-1.3/configure
Index: configure
===================================================================
RCS file: /home/cvs/apache-1.3/configure,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- configure 2001/02/07 13:07:24 1.131
+++ configure 2001/08/29 13:32:07 1.132
@@ -426,7 +426,8 @@
echo " --sysconfdir=DIR install configuration files in DIR"
echo " --datadir=DIR install read-only data files in DIR"
echo " --iconsdir=DIR install read-only icon files in DIR"
- echo " --htdocsdir=DIR install read-only document files in DIR"
+ echo " --htdocsdir=DIR install read-only welcome pages in DIR"
+ echo " --manualdir=DIR install read-only on-line documentation in DIR"
echo " --cgidir=DIR install read-only cgi files in DIR"
echo " --includedir=DIR install includes files in DIR"
echo " --localstatedir=DIR install modifiable data files in DIR"
@@ -499,8 +500,9 @@
OOIFS="$IFS" # most likely not needed: jmj
IFS="$DIFS" # ditto
for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir iconsdir htdocsdir cgidir includedir \
- localstatedir runtimedir logfiledir proxycachedir; do
+ sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
+ includedir localstatedir runtimedir logfiledir \
+ proxycachedir; do
eval "val=\"\$$var\""
case $val in
*+ )
@@ -673,6 +675,10 @@
htdocsdir="$apc_optarg"
autosuffix_htdocsdir=no
;;
+ --manualdir=*)
+ manualdir="$apc_optarg"
+ autosuffix_manualdir=no
+ ;;
--cgidir=*)
cgidir="$apc_optarg"
autosuffix_cgidir=no
@@ -1099,14 +1105,14 @@
##
## expand path variables and make sure
-## they do not end with a backslash
+## they do not end in a backslash
##
OIFS="$IFS"
IFS="$DIFS"
for var in prefix exec_prefix bindir sbindir libexecdir mandir \
- sysconfdir datadir iconsdir htdocsdir cgidir includedir \
- localstatedir runtimedir logfiledir proxycachedir \
- suexec_docroot suexec_logexec ; do
+ sysconfdir datadir iconsdir htdocsdir manualdir cgidir \
+ includedir localstatedir runtimedir logfiledir \
+ proxycachedir suexec_docroot suexec_logexec ; do
eval "val=\"\$$var\"";
val=`echo $val | sed -e 's:\(.\)/*$:\1:'`
eval "$var=\"$val\""
@@ -1231,6 +1237,7 @@
echo " datadir: $datadir"
echo " iconsdir: $iconsdir"
echo " htdocsdir: $htdocsdir"
+ echo " manualdir: $manualdir"
echo " cgidir: $cgidir"
echo " includedir: $includedir"
echo " localstatedir: $localstatedir"
@@ -1302,6 +1309,7 @@
-e "s%@datadir@%$datadir%g" \
-e "s%@iconsdir@%$iconsdir%g" \
-e "s%@htdocsdir@%$htdocsdir%g" \
+-e "s%@manualdir@%$manualdir%g" \
-e "s%@cgidir@%$cgidir%g" \
-e "s%@localstatedir@%$localstatedir%g" \
-e "s%@includedir@%$includedir%g" \
1.4 +1 -1 apache-1.3/conf/highperformance.conf-dist
Index: highperformance.conf-dist
===================================================================
RCS file: /home/cvs/apache-1.3/conf/highperformance.conf-dist,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- highperformance.conf-dist 1999/04/20 21:40:58 1.3
+++ highperformance.conf-dist 2001/08/29 13:32:07 1.4
@@ -1,6 +1,6 @@
# Ha, you're reading this config file looking for the easy way out!
# "how do I make my apache server go really really fast??"
-# Well you could start by reading the htdocs/manual/misc/perf-tuning.html
+# Well you could start by reading the /manual/misc/perf-tuning.html
# page. But, we'll give you a head start.
#
# This config file is small, it is probably not what you'd expect on a
1.75 +13 -0 apache-1.3/conf/httpd.conf-dist
Index: httpd.conf-dist
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- httpd.conf-dist 2001/08/23 00:07:37 1.74
+++ httpd.conf-dist 2001/08/29 13:32:07 1.75
@@ -545,6 +545,19 @@
Allow from all
</Directory>
+ # This Alias will project the on-line documentation tree into your
+ # logical DocumentRoot. Comment it if you don't want to provide access
+ # to the on-line docu for some reason.
+ #
+ Alias /manual/ "@@ServerRoot@@/manual/"
+
+ <Directory "@@ServerRoot@@/manual">
+ Options Indexes FollowSymlinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+
#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
1.15 +13 -0 apache-1.3/conf/httpd.conf-dist-nw
Index: httpd.conf-dist-nw
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-nw,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- httpd.conf-dist-nw 2001/08/23 00:07:37 1.14
+++ httpd.conf-dist-nw 2001/08/29 13:32:07 1.15
@@ -480,6 +480,19 @@
Allow from all
</Directory>
+ # This Alias will project the on-line documentation tree into your
+ # logical DocumentRoot. Comment it if you don't want to provide access
+ # to the on-line docu for some reason.
+ #
+ Alias /manual/ "sys:/apache/manual/"
+
+ <Directory "sys:/apache/manual">
+ Options Indexes FollowSymlinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+
#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
1.56 +13 -0 apache-1.3/conf/httpd.conf-dist-win
Index: httpd.conf-dist-win
===================================================================
RCS file: /home/cvs/apache-1.3/conf/httpd.conf-dist-win,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- httpd.conf-dist-win 2001/07/06 19:55:24 1.55
+++ httpd.conf-dist-win 2001/08/29 13:32:07 1.56
@@ -548,6 +548,19 @@
Allow from all
</Directory>
+ # This Alias will project the on-line documentation tree into your
+ # logical DocumentRoot. Comment it if you don't want to provide access
+ # to the on-line docu for some reason.
+ #
+ Alias /manual/ "@@ServerRoot@@/manual/"
+
+ <Directory "@@ServerRoot@@/manual">
+ Options Indexes FollowSymlinks MultiViews
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+
#
# ScriptAlias: This controls which directories contain server scripts.
# ScriptAliases are essentially the same as Aliases, except that
Re: cvs commit: apache-1.3/conf highperformance.conf-dist httpd.conf-dist
httpd.conf-dist-nw httpd.conf-dist-win
Posted by Marc Slemko <ma...@znep.com>.
On 29 Aug 2001 martin@apache.org wrote:
> martin 01/08/29 06:32:07
>
> Modified: src CHANGES
> . Makefile.tmpl config.layout configure
> conf highperformance.conf-dist httpd.conf-dist
> httpd.conf-dist-nw httpd.conf-dist-win
> Log:
> Parallel to a change in Apache-2.0, the manual directory was moved out of
> the DocumentRoot tree to simplify the separation of private
> content&configuration from server's on-line documentation. An "Alias
> /manual/ ..." projects the manual/ directory (which resides now
> side-by-side with the icons/ directory) into the logical DocumentRoot.
> Note that a request to http://server/manual (without the trailing slash)
> will now behave different than before (it used to redirect to
> http://server/manual/ but no longer does).
I'm not sure it makes sense to be backporting changes like this to
1.3, but in any case...
Why are we not using the same alias as in 2.0, ie. "Alias /manual ..."
instead lf "Alias /manual/ ..."? If you do it like it is done in 2.0,
then you do not need the trailing "/".