fielding 98/10/03 04:05:07
Modified: conf access.conf-dist highperformance.conf-dist
httpd.conf-dist srm.conf-dist
Log:
Quote paths in default configuration files.
Submitted by: Wilfredo Sanchez <[EMAIL PROTECTED]>
Reviewed by: Roy Fielding, Ralf S. Engelschall
Revision Changes Path
1.16 +2 -2 apache-1.3/conf/access.conf-dist
Index: access.conf-dist
===================================================================
RCS file: /home/cvs/apache-1.3/conf/access.conf-dist,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- access.conf-dist 1998/09/03 18:04:08 1.15
+++ access.conf-dist 1998/10/03 11:05:05 1.16
@@ -25,7 +25,7 @@
# This should be changed to whatever you set DocumentRoot to.
-<Directory @@ServerRoot@@/htdocs>
+<Directory "@@ServerRoot@@/htdocs">
# This may also be "None", "All", or any combination of "Indexes",
# "Includes", "FollowSymLinks", "ExecCGI", or "MultiViews".
@@ -51,7 +51,7 @@
# @@ServerRoot@@/cgi-bin should be changed to whatever your ScriptAliased
# CGI directory exists, if you have that configured.
-<Directory @@ServerRoot@@/cgi-bin>
+<Directory "@@ServerRoot@@/cgi-bin">
AllowOverride None
Options None
</Directory>
1.2 +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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- highperformance.conf-dist 1998/03/13 01:32:33 1.1
+++ highperformance.conf-dist 1998/10/03 11:05:05 1.2
@@ -43,7 +43,7 @@
</Directory>
# If this was a real internet server you'd probably want to uncomment this:
-#<Directory @@ServerRoot@@/htdocs>
+#<Directory "@@ServerRoot@@/htdocs">
# order allow,deny
# allow from all
#</Directory>
1.31 +1 -1 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- httpd.conf-dist 1998/09/12 20:16:50 1.30
+++ httpd.conf-dist 1998/10/03 11:05:05 1.31
@@ -63,7 +63,7 @@
# mounted filesystem then please read the LockFile documentation,
# you will save yourself a lot of trouble.
-ServerRoot @@ServerRoot@@
+ServerRoot "@@ServerRoot@@"
# BindAddress: You can support virtual hosts with this option. This option
# is used to tell the server which IP address to listen to. It can either
1.27 +4 -4 apache-1.3/conf/srm.conf-dist
Index: srm.conf-dist
===================================================================
RCS file: /home/cvs/apache-1.3/conf/srm.conf-dist,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- srm.conf-dist 1998/08/30 21:47:08 1.26
+++ srm.conf-dist 1998/10/03 11:05:06 1.27
@@ -12,12 +12,12 @@
# documents. By default, all requests are taken from this directory, but
# symbolic links and aliases may be used to point to other locations.
-DocumentRoot @@ServerRoot@@/htdocs
+DocumentRoot "@@ServerRoot@@/htdocs"
# UserDir: The name of the directory which is appended onto a user's home
# directory if a ~user request is recieved.
-UserDir public_html
+UserDir "@@UserDir@@"
# DirectoryIndex: Name of the file or files to use as a pre-written HTML
# directory index. Separate multiple entries with spaces.
@@ -152,12 +152,12 @@
# require it to be present in the URL. So "/icons" isn't aliased in this
# example.
-Alias /icons/ @@ServerRoot@@/icons/
+Alias /icons/ "@@ServerRoot@@/icons/"
# ScriptAlias: This controls which directories contain server scripts.
# Format: ScriptAlias fakename realname
-#ScriptAlias /cgi-bin/ @@ServerRoot@@/cgi-bin/
+ScriptAlias /cgi-bin/ "@@ServerRoot@@/cgi-bin/"
# If you want to use server side includes, or CGI outside
# ScriptAliased directories, uncomment the following lines.
