From: Ken Coar Date: Wed, 15 Apr 2015 18:17:34 +0000 (+0000) Subject: Quote ScriptAlias and DocumentRoot arguments. X-Git-Tag: 2.5.0-alpha~3279 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=198976aa9d100cd4a98ba16e45bba564a7e04d1e;p=thirdparty%2Fapache%2Fhttpd.git Quote ScriptAlias and DocumentRoot arguments. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673917 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr index 63a0e175cda..ad43fdb4d30 100644 --- a/docs/manual/expr.xml.fr +++ b/docs/manual/expr.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en index 5a7c34f8280..cfe760999a0 100644 --- a/docs/manual/howto/cgi.html.en +++ b/docs/manual/howto/cgi.html.en @@ -83,7 +83,7 @@

The ScriptAlias directive looks like:

- 
ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
+ 
ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"

The example shown is from your default httpd.conf diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml index 9ca0e6b4361..d3aaa004b1f 100644 --- a/docs/manual/howto/cgi.xml +++ b/docs/manual/howto/cgi.xml @@ -84,7 +84,7 @@ directive looks like:

- ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/ +ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"

The example shown is from your default httpd.conf diff --git a/docs/manual/misc/perf-scaling.html.en b/docs/manual/misc/perf-scaling.html.en index be5acff59e2..d36860e04b1 100644 --- a/docs/manual/misc/perf-scaling.html.en +++ b/docs/manual/misc/perf-scaling.html.en @@ -1298,7 +1298,7 @@ Swap: 3903784 12540 3891244 ErrorLog /home/sctemme/inst/blog/httpd/logs/error_log LogLevel debug CustomLog /home/sctemme/inst/blog/httpd/logs/access_log common - ScriptAlias /cgi-bin/ /home/sctemme/inst/blog/bin/ + ScriptAlias "/cgi-bin/" "/home/sctemme/inst/blog/bin/" <Directory "/home/sctemme/inst/blog/bin"> Options +ExecCGI Require all granted diff --git a/docs/manual/misc/perf-scaling.xml b/docs/manual/misc/perf-scaling.xml index cb88b8bf113..10289c5ddb0 100644 --- a/docs/manual/misc/perf-scaling.xml +++ b/docs/manual/misc/perf-scaling.xml @@ -1297,7 +1297,7 @@ Listen *:8001 ErrorLog /home/sctemme/inst/blog/httpd/logs/error_log LogLevel debug CustomLog /home/sctemme/inst/blog/httpd/logs/access_log common - ScriptAlias /cgi-bin/ /home/sctemme/inst/blog/bin/ + ScriptAlias "/cgi-bin/" "/home/sctemme/inst/blog/bin/" <Directory "/home/sctemme/inst/blog/bin"> Options +ExecCGI Require all granted diff --git a/docs/manual/misc/perf-tuning.html.en b/docs/manual/misc/perf-tuning.html.en index 4f36d3676f5..b698fd05505 100644 --- a/docs/manual/misc/perf-tuning.html.en +++ b/docs/manual/misc/perf-tuning.html.en @@ -159,7 +159,7 @@ system calls to check up on symlinks. One extra call per filename component. For example, if you had:

- 
DocumentRoot /www/htdocs
+      
DocumentRoot "/www/htdocs"
 <Directory "/">
   Options SymLinksIfOwnerMatch
 </Directory>

@@ -173,7 +173,7 @@
       every single request. If you really desire the symlinks
       security checking you can do something like this:

 
-      
DocumentRoot /www/htdocs
+      
DocumentRoot "/www/htdocs"
 <Directory "/">
   Options FollowSymLinks
 </Directory>
@@ -203,7 +203,7 @@
       .htaccess for each filename component. For
       example,

 
-      
DocumentRoot /www/htdocs
+      
DocumentRoot "/www/htdocs"
 <Directory "/">
   AllowOverride all
 </Directory>

diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml
index 6853e68e27b..5429f0b8727 100644
--- a/docs/manual/misc/perf-tuning.xml
+++ b/docs/manual/misc/perf-tuning.xml
@@ -176,7 +176,7 @@ HostnameLookups off
       filename component. For example, if you had:

 
       
-DocumentRoot /www/htdocs
+DocumentRoot "/www/htdocs"
 <Directory "/">
   Options SymLinksIfOwnerMatch
 </Directory>
@@ -191,7 +191,7 @@ DocumentRoot /www/htdocs
       security checking you can do something like this:

 
       
-DocumentRoot /www/htdocs
+DocumentRoot "/www/htdocs"
 <Directory "/">
   Options FollowSymLinks
 </Directory>
@@ -222,7 +222,7 @@ DocumentRoot /www/htdocs
       example,

 
       
-DocumentRoot /www/htdocs
+DocumentRoot "/www/htdocs"
 <Directory "/">
   AllowOverride all
 </Directory>
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en
index ae927b47c40..1f60fc16d96 100644
--- a/docs/manual/mod/core.html.en
+++ b/docs/manual/mod/core.html.en
@@ -804,7 +804,7 @@ which no other media type configuration could be found.
   Define SSL
 </IfDefine>
 
-DocumentRoot /var/www/${servername}/htdocs

+DocumentRoot "/var/www/${servername}/htdocs"

 
 
     
Variable names may not contain colon ":" characters, to avoid clashes
@@ -4538,7 +4538,7 @@ hostname or IP address
 
     
<VirtualHost 10.1.2.3:80>
   ServerAdmin webmaster@host.example.com
-  DocumentRoot /www/docs/host.example.com
+  DocumentRoot "/www/docs/host.example.com"
   ServerName host.example.com
   ErrorLog logs/host.example.com-error_log
   TransferLog logs/host.example.com-access_log
@@ -4552,7 +4552,7 @@ hostname or IP address
 
     
<VirtualHost [2001:db8::a00:20ff:fea7:ccea]:80>
   ServerAdmin webmaster@host.example.com
-  DocumentRoot /www/docs/host.example.com
+  DocumentRoot "/www/docs/host.example.com"
   ServerName host.example.com
   ErrorLog logs/host.example.com-error_log
   TransferLog logs/host.example.com-access_log
diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml
index 113103e4e6d..7eac6064be0 100644
--- a/docs/manual/mod/core.xml
+++ b/docs/manual/mod/core.xml
@@ -741,7 +741,7 @@ which no other media type configuration could be found.
   Define SSL
 </IfDefine>
 
-DocumentRoot /var/www/${servername}/htdocs
+DocumentRoot "/var/www/${servername}/htdocs"
     
 
     
Variable names may not contain colon ":" characters, to avoid clashes
@@ -968,7 +968,9 @@ from the web
     path from the requested URL to the document root to make the
     path to the document. Example:

 
-    DocumentRoot "/usr/web"
+    
+DocumentRoot "/usr/web"
+    
 
     
then an access to
     http://my.example.com/index.html refers to
@@ -4493,7 +4495,7 @@ hostname or IP address
     
 <VirtualHost 10.1.2.3:80>
   ServerAdmin webmaster@host.example.com
-  DocumentRoot /www/docs/host.example.com
+  DocumentRoot "/www/docs/host.example.com"
   ServerName host.example.com
   ErrorLog logs/host.example.com-error_log
   TransferLog logs/host.example.com-access_log
@@ -4508,7 +4510,7 @@ hostname or IP address
     
 <VirtualHost [2001:db8::a00:20ff:fea7:ccea]:80>
   ServerAdmin webmaster@host.example.com
-  DocumentRoot /www/docs/host.example.com
+  DocumentRoot "/www/docs/host.example.com"
   ServerName host.example.com
   ErrorLog logs/host.example.com-error_log
   TransferLog logs/host.example.com-access_log
diff --git a/docs/manual/mod/mod_alias.xml.fr b/docs/manual/mod/mod_alias.xml.fr
index 2ae81f8d7e2..d3823a86f4e 100644
--- a/docs/manual/mod/mod_alias.xml.fr
+++ b/docs/manual/mod/mod_alias.xml.fr
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja
index 9aa7876e257..b961c026a43 100644
--- a/docs/manual/mod/mod_alias.xml.ja
+++ b/docs/manual/mod/mod_alias.xml.ja
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
+
 
 
+
 
+
 
 
 
diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en
index c7d0657cb96..3d88bbf10cc 100644
--- a/docs/manual/mod/mod_vhost_alias.html.en
+++ b/docs/manual/mod/mod_vhost_alias.html.en
@@ -48,8 +48,8 @@ hosting
       /cgi-bin/script.pl to 
       /usr/local/apache2/cgi-bin/script.pl in all cases:

 
-      
ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/
-VirtualScriptAlias /never/found/%0/cgi-bin/

+      
ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"
+VirtualScriptAlias "/never/found/%0/cgi-bin/"

 
     
 
@@ -143,7 +143,7 @@ VirtualScriptAlias /never/found/%0/cgi-bin/

     following directives in your server configuration file:

 
     
UseCanonicalName    Off
-VirtualDocumentRoot /usr/local/apache/vhosts/%0

+VirtualDocumentRoot "/usr/local/apache/vhosts/%0"

 
 
     
A request for
@@ -158,7 +158,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%0

     following in your configuration file:

 
     
UseCanonicalName    Off
-VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2

+VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2"

A request for @@ -169,7 +169,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2

A more even spread of files can be achieved by hashing from the end of the name, for example:

-
VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2
+
VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2"

The example request would come from @@ -177,7 +177,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2

Alternatively you might use:

-
VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+
+
VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+"

The example request would come from @@ -205,8 +205,8 @@ or example.com will all point to /usr/local/apache/vhosts/exa your configuration file:

UseCanonicalName DNS
-VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs
-VirtualScriptAliasIP  /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin
+VirtualDocumentRootIP "/usr/local/apache/vhosts/%1/%2/%3/%4/docs" +VirtualScriptAliasIP "/usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin"

A request for @@ -224,7 +224,7 @@ VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin a % directive, you can work around the problem in the following way:

-
VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0
+ 
VirtualDocumentRoot "/usr/local/apache/vhosts/%2.0.%3.0"

A request for diff --git a/docs/manual/mod/mod_vhost_alias.xml b/docs/manual/mod/mod_vhost_alias.xml index 4b7eb17c22c..c70950b53f2 100644 --- a/docs/manual/mod/mod_vhost_alias.xml +++ b/docs/manual/mod/mod_vhost_alias.xml @@ -45,8 +45,8 @@ hosting /usr/local/apache2/cgi-bin/script.pl in all cases:

-ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/ -VirtualScriptAlias /never/found/%0/cgi-bin/ +ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/" +VirtualScriptAlias "/never/found/%0/cgi-bin/" @@ -128,7 +128,7 @@ VirtualScriptAlias /never/found/%0/cgi-bin/ UseCanonicalName Off -VirtualDocumentRoot /usr/local/apache/vhosts/%0 +VirtualDocumentRoot "/usr/local/apache/vhosts/%0"

A request for @@ -144,7 +144,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%0 UseCanonicalName Off -VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2 +VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2"

A request for @@ -156,7 +156,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2 end of the name, for example:

- VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2 +VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2"

The example request would come from @@ -165,7 +165,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2

Alternatively you might use:

- VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+ +VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+"

The example request would come from @@ -183,7 +183,7 @@ to the hostname. As such, one can make a configuration that will direct all firs or third level subdomains to the same directory:

- VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0" +VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0"

In the example above, both www.example.com as well as www.sub.example.com @@ -195,8 +195,8 @@ or example.com will all point to /usr/local/apache/vhosts/exa UseCanonicalName DNS -VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs -VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin +VirtualDocumentRootIP "/usr/local/apache/vhosts/%1/%2/%3/%4/docs" +VirtualScriptAliasIP "/usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin"

A request for @@ -214,9 +214,9 @@ VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin a % directive, you can work around the problem in the following way:

- - VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0 - + +VirtualDocumentRoot "/usr/local/apache/vhosts/%2.0.%3.0" +

A request for http://www.domain.example.com/directory/file.html diff --git a/docs/manual/rewrite/flags.html.fr b/docs/manual/rewrite/flags.html.fr index c30df7093cd..480d8b9a40a 100644 --- a/docs/manual/rewrite/flags.html.fr +++ b/docs/manual/rewrite/flags.html.fr @@ -24,6 +24,8 @@

Langues Disponibles:  en  |  fr 

+
Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.

Ce document décrit les drapeaux disponibles dans la directive RewriteRule, en fournissant diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr index 4ed3801dac9..b7a54570472 100644 --- a/docs/manual/rewrite/flags.xml.fr +++ b/docs/manual/rewrite/flags.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta index 912229af035..e4f3ee6f495 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ en - fr + fr diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr index e376d5a29f9..d2176b68ca7 100644 --- a/docs/manual/sections.xml.fr +++ b/docs/manual/sections.xml.fr @@ -3,7 +3,7 @@ - + + + + - + + + +