Quote any file system path that may have spaces when expanded

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@515403 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/conf/extra/httpd-mpm.conf.in b/docs/conf/extra/httpd-mpm.conf.in
index 1e0ed28d0735e63c4f949375b2ca21b5fa1d1bfe..d7d70cd7c942c90add44c5ec6ae471b247e4b6e6 100644 (file)
--- a/docs/conf/extra/httpd-mpm.conf.in
+++ b/docs/conf/extra/httpd-mpm.conf.in
@@ -9,7 +9,7 @@
 # Note that this is the default PidFile for most MPMs.
 #
 <IfModule !mpm_netware_module>
-    PidFile @rel_runtimedir@/httpd.pid
+    PidFile "@rel_runtimedir@/httpd.pid"
 </IfModule>
 
 #
@@ -17,7 +17,7 @@
 #
 <IfModule !mpm_winnt_module>
 <IfModule !mpm_netware_module>
-LockFile @rel_logfiledir@/accept.lock
+LockFile "@rel_logfiledir@/accept.lock"
 </IfModule>
 </IfModule>
 

diff --git a/docs/conf/extra/httpd-ssl.conf.in b/docs/conf/extra/httpd-ssl.conf.in
index 621ddb39b35b14ce93b8ffcf60acbd6f4ad232e6..e3c2e1fe97b09cd58e4f07fd046ade3c6d5c59cb 100644 (file)
--- a/docs/conf/extra/httpd-ssl.conf.in
+++ b/docs/conf/extra/httpd-ssl.conf.in
@@ -58,14 +58,14 @@ SSLPassPhraseDialog  builtin
 #   Inter-Process Session Cache:
 #   Configure the SSL Session Cache: First the mechanism 
 #   to use and second the expiring timeout (in seconds).
-#SSLSessionCache         dbm:@exp_runtimedir@/ssl_scache
-SSLSessionCache        shmcb:@exp_runtimedir@/ssl_scache(512000)
+#SSLSessionCache         "dbm:@exp_runtimedir@/ssl_scache"
+SSLSessionCache        "shmcb:@exp_runtimedir@/ssl_scache(512000)"
 SSLSessionCacheTimeout  300
 
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-SSLMutex  file:@exp_runtimedir@/ssl_mutex
+SSLMutex  "file:@exp_runtimedir@/ssl_mutex"
 
 ##
 ## SSL Virtual Host Context
@@ -77,8 +77,8 @@ SSLMutex  file:@exp_runtimedir@/ssl_mutex
 DocumentRoot "@exp_htdocsdir@"
 ServerName www.example.com:443
 ServerAdmin you@example.com
-ErrorLog @exp_logfiledir@/error_log
-TransferLog @exp_logfiledir@/access_log
+ErrorLog "@exp_logfiledir@/error_log"
+TransferLog "@exp_logfiledir@/access_log"
 
 #   SSL Engine Switch:
 #   Enable/Disable SSL for this virtual host.
@@ -96,16 +96,16 @@ SSLCipherSuite ALL:!ADH:!EXPORT56:RC4+RSA:+HIGH:+MEDIUM:+LOW:+SSLv2:+EXP:+eNULL
 #   in mind that if you have both an RSA and a DSA certificate you
 #   can configure both in parallel (to also allow the use of DSA
 #   ciphers, etc.)
-SSLCertificateFile @exp_sysconfdir@/server.crt
-#SSLCertificateFile @exp_sysconfdir@/server-dsa.crt
+SSLCertificateFile "@exp_sysconfdir@/server.crt"
+#SSLCertificateFile "@exp_sysconfdir@/server-dsa.crt"
 
 #   Server Private Key:
 #   If the key is not combined with the certificate, use this
 #   directive to point at the key file.  Keep in mind that if
 #   you've both a RSA and a DSA private key you can configure
 #   both in parallel (to also allow the use of DSA ciphers, etc.)
-SSLCertificateKeyFile @exp_sysconfdir@/server.key
-#SSLCertificateKeyFile @exp_sysconfdir@/server-dsa.key
+SSLCertificateKeyFile "@exp_sysconfdir@/server.key"
+#SSLCertificateKeyFile "@exp_sysconfdir@/server-dsa.key"
 
 #   Server Certificate Chain:
 #   Point SSLCertificateChainFile at a file containing the
@@ -114,7 +114,7 @@ SSLCertificateKeyFile @exp_sysconfdir@/server.key
 #   the referenced file can be the same as SSLCertificateFile
 #   when the CA certificates are directly appended to the server
 #   certificate for convenience.
-#SSLCertificateChainFile @exp_sysconfdir@/server-ca.crt
+#SSLCertificateChainFile "@exp_sysconfdir@/server-ca.crt"
 
 #   Certificate Authority (CA):
 #   Set the CA certificate verification path where to find CA
@@ -123,8 +123,8 @@ SSLCertificateKeyFile @exp_sysconfdir@/server.key
 #   Note: Inside SSLCACertificatePath you need hash symlinks
 #         to point to the certificate files. Use the provided
 #         Makefile to update the hash symlinks after changes.
-#SSLCACertificatePath @exp_sysconfdir@/ssl.crt
-#SSLCACertificateFile @exp_sysconfdir@/ssl.crt/ca-bundle.crt
+#SSLCACertificatePath "@exp_sysconfdir@/ssl.crt"
+#SSLCACertificateFile "@exp_sysconfdir@/ssl.crt/ca-bundle.crt"
 
 #   Certificate Revocation Lists (CRL):
 #   Set the CA revocation path where to find CA CRLs for client
@@ -133,8 +133,8 @@ SSLCertificateKeyFile @exp_sysconfdir@/server.key
 #   Note: Inside SSLCARevocationPath you need hash symlinks
 #         to point to the certificate files. Use the provided
 #         Makefile to update the hash symlinks after changes.
-#SSLCARevocationPath @exp_sysconfdir@/ssl.crl
-#SSLCARevocationFile @exp_sysconfdir@/ssl.crl/ca-bundle.crl
+#SSLCARevocationPath "@exp_sysconfdir@/ssl.crl"
+#SSLCARevocationFile "@exp_sysconfdir@/ssl.crl/ca-bundle.crl"
 
 #   Client Authentication (Type):
 #   Client certificate verification type and depth.  Types are
@@ -225,7 +225,7 @@ BrowserMatch ".*MSIE.*" \
 #   Per-Server Logging:
 #   The home of a custom SSL log file. Use this when you want a
 #   compact non-error SSL logfile on a virtual host basis.
-CustomLog @exp_logfiledir@/ssl_request_log \
+CustomLog "@exp_logfiledir@/ssl_request_log" \
           "%t %h %{SSL_PROTOCOL}x %{SSL_CIPHER}x \"%r\" %b"
 
 </VirtualHost>                                  

diff --git a/docs/conf/extra/httpd-userdir.conf.in b/docs/conf/extra/httpd-userdir.conf.in
index 210fba0a71d12468f38e4c194c9356664a566d39..b801a31cbb81f847189a311c0d20c423661dc8d7 100644 (file)
--- a/docs/conf/extra/httpd-userdir.conf.in
+++ b/docs/conf/extra/httpd-userdir.conf.in
@@ -13,7 +13,7 @@ UserDir public_html
 # Control access to UserDir directories.  The following is an example
 # for a site where these directories are restricted to read-only.
 #
-<Directory /home/*/public_html>
+<Directory "/home/*/public_html">
     AllowOverride FileInfo AuthConfig Limit Indexes
     Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
     <Limit GET POST OPTIONS>

diff --git a/docs/conf/extra/httpd-vhosts.conf.in b/docs/conf/extra/httpd-vhosts.conf.in
index 3f6918617dffb110679d4c2b360e0fba194905fc..724aaebd63caff0145d973abdad07a661a4b286b 100644 (file)
--- a/docs/conf/extra/httpd-vhosts.conf.in
+++ b/docs/conf/extra/httpd-vhosts.conf.in
@@ -26,19 +26,19 @@ NameVirtualHost *:@@Port@@
 #
 <VirtualHost *:@@Port@@>
     ServerAdmin webmaster@dummy-host.example.com
-    DocumentRoot @@ServerRoot@@/docs/dummy-host.example.com
+    DocumentRoot "@@ServerRoot@@/docs/dummy-host.example.com"
     ServerName dummy-host.example.com
     ServerAlias www.dummy-host.example.com
-    ErrorLog @rel_logfiledir@/dummy-host.example.com-error_log
-    CustomLog @rel_logfiledir@/dummy-host.example.com-access_log common
+    ErrorLog "@rel_logfiledir@/dummy-host.example.com-error_log"
+    CustomLog "@rel_logfiledir@/dummy-host.example.com-access_log" common
 </VirtualHost>
 
 <VirtualHost *:@@Port@@>
     ServerAdmin webmaster@dummy-host2.example.com
-    DocumentRoot @@ServerRoot@@/docs/dummy-host2.example.com
+    DocumentRoot "@@ServerRoot@@/docs/dummy-host2.example.com"
     ServerName dummy-host2.example.com
-    ErrorLog @rel_logfiledir@/dummy-host2.example.com-error_log
-    CustomLog @rel_logfiledir@/dummy-host2.example.com-access_log common
+    ErrorLog "@rel_logfiledir@/dummy-host2.example.com-error_log"
+    CustomLog "@rel_logfiledir@/dummy-host2.example.com-access_log" common
 </VirtualHost>