httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Wilfredo Sanchez <wsanc...@apple.com>
Subject [PATCH] quote paths in conf files
Date Fri, 02 Oct 1998 01:46:07 GMT
  In the wacky world of Mac OS, people put spaces in paths. So we
should quote the paths in the conf files that may be specified at
configure time. Apparently we've already run into this on Windows,
where this is already fixed.

	-Fred


Index: access.conf-dist
===================================================================
RCS file: /CVSRoot/CoreOS/Services/apache/apache/conf/access.conf-dist,v
retrieving revision 1.1.1.4
diff -u -d -b -w -r1.1.1.4 access.conf-dist
--- access.conf-dist    1998/10/01 23:00:56     1.1.1.4
+++ access.conf-dist    1998/10/02 01:43:43
@@ -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>
Index: highperformance.conf-dist
===================================================================
RCS file: /CVSRoot/CoreOS/Services/apache/apache/conf/highperformance.conf-dist,v
retrieving revision 1.1.1.1
diff -u -d -b -w -r1.1.1.1 highperformance.conf-dist
--- highperformance.conf-dist   1998/06/16 15:36:03     1.1.1.1
+++ highperformance.conf-dist   1998/10/02 01:43:43
@@ -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>
Index: httpd.conf-dist
===================================================================
RCS file: /CVSRoot/CoreOS/Services/apache/apache/conf/httpd.conf-dist,v
retrieving revision 1.1.1.4
diff -u -d -b -w -r1.1.1.4 httpd.conf-dist
--- httpd.conf-dist     1998/10/01 23:00:56     1.1.1.4
+++ httpd.conf-dist     1998/10/02 01:43:43
@@ -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
Index: srm.conf-dist
===================================================================
RCS file: /CVSRoot/CoreOS/Services/apache/apache/conf/srm.conf-dist,v
retrieving revision 1.1.1.4
retrieving revision 1.5
diff -u -d -b -w -r1.1.1.4 -r1.5
--- srm.conf-dist       1998/10/01 23:00:57     1.1.1.4
+++ srm.conf-dist       1998/10/02 00:41:49     1.5
@@ -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.

Mime
View raw message