diff options
| author | Ken Coar <coar@apache.org> | 2015-04-15 20:17:34 +0200 |
|---|---|---|
| committer | Ken Coar <coar@apache.org> | 2015-04-15 20:17:34 +0200 |
| commit | 198976aa9d100cd4a98ba16e45bba564a7e04d1e (patch) | |
| tree | c61656e0397b3faddbe8406c81bc4bb9fe586dd8 | |
| parent | Quote {Alias,Redirect,ScriptAlias}{,Match} arguments. (diff) | |
| download | apache2-198976aa9d100cd4a98ba16e45bba564a7e04d1e.tar.xz apache2-198976aa9d100cd4a98ba16e45bba564a7e04d1e.zip | |
Quote ScriptAlias and DocumentRoot arguments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673917 13f79535-47bb-0310-9956-ffa450edef68
39 files changed, 167 insertions, 161 deletions
diff --git a/docs/manual/expr.xml.fr b/docs/manual/expr.xml.fr index 63a0e175cd..ad43fdb4d3 100644 --- a/docs/manual/expr.xml.fr +++ b/docs/manual/expr.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> -<!-- English Revision: 1663123:1673892 (outdated) --> +<!-- English Revision: 1663123:1673908 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/howto/cgi.html.en b/docs/manual/howto/cgi.html.en index 5a7c34f828..cfe760999a 100644 --- a/docs/manual/howto/cgi.html.en +++ b/docs/manual/howto/cgi.html.en @@ -83,7 +83,7 @@ <p>The <code class="directive"><a href="../mod/mod_alias.html#scriptalias">ScriptAlias</a></code> directive looks like:</p> - <pre class="prettyprint lang-config">ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/</pre> + <pre class="prettyprint lang-config">ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/"</pre> <p>The example shown is from your default <code>httpd.conf</code> diff --git a/docs/manual/howto/cgi.xml b/docs/manual/howto/cgi.xml index 9ca0e6b436..d3aaa004b1 100644 --- a/docs/manual/howto/cgi.xml +++ b/docs/manual/howto/cgi.xml @@ -84,7 +84,7 @@ directive looks like:</p> <highlight language="config"> - ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/ +ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/" </highlight> <p>The example shown is from your default <code>httpd.conf</code> diff --git a/docs/manual/misc/perf-scaling.html.en b/docs/manual/misc/perf-scaling.html.en index be5acff59e..d36860e04b 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</pre></div> 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 cb88b8bf11..10289c5ddb 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 4f36d3676f..b698fd0550 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:</p> - <pre class="prettyprint lang-config">DocumentRoot /www/htdocs + <pre class="prettyprint lang-config">DocumentRoot "/www/htdocs" <Directory "/"> Options SymLinksIfOwnerMatch </Directory></pre> @@ -173,7 +173,7 @@ every single request. If you really desire the symlinks security checking you can do something like this:</p> - <pre class="prettyprint lang-config">DocumentRoot /www/htdocs + <pre class="prettyprint lang-config">DocumentRoot "/www/htdocs" <Directory "/"> Options FollowSymLinks </Directory> @@ -203,7 +203,7 @@ <code>.htaccess</code> for each filename component. For example,</p> - <pre class="prettyprint lang-config">DocumentRoot /www/htdocs + <pre class="prettyprint lang-config">DocumentRoot "/www/htdocs" <Directory "/"> AllowOverride all </Directory></pre> diff --git a/docs/manual/misc/perf-tuning.xml b/docs/manual/misc/perf-tuning.xml index 6853e68e27..5429f0b872 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:</p> <highlight language="config"> -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:</p> <highlight language="config"> -DocumentRoot /www/htdocs +DocumentRoot "/www/htdocs" <Directory "/"> Options FollowSymLinks </Directory> @@ -222,7 +222,7 @@ DocumentRoot /www/htdocs example,</p> <highlight language="config"> -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 ae927b47c4..1f60fc16d9 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</pre> +DocumentRoot "/var/www/${servername}/htdocs"</pre> <p>Variable names may not contain colon ":" characters, to avoid clashes @@ -4538,7 +4538,7 @@ hostname or IP address</td></tr> <pre class="prettyprint lang-config"><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</td></tr> <pre class="prettyprint lang-config"><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 113103e4e6..7eac6064be 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" </highlight> <p>Variable names may not contain colon ":" characters, to avoid clashes @@ -968,7 +968,9 @@ from the web</description> path from the requested URL to the document root to make the path to the document. Example:</p> - <highlight language="config">DocumentRoot "/usr/web"</highlight> + <highlight language="config"> +DocumentRoot "/usr/web" + </highlight> <p>then an access to <code>http://my.example.com/index.html</code> refers to @@ -4493,7 +4495,7 @@ hostname or IP address</description> <highlight language="config"> <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</description> <highlight language="config"> <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 2ae81f8d7e..d3823a86f4 100644 --- a/docs/manual/mod/mod_alias.xml.fr +++ b/docs/manual/mod/mod_alias.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1653941:1673892 (outdated) --> +<!-- English Revision: 1653941:1673908 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_alias.xml.ja b/docs/manual/mod/mod_alias.xml.ja index 9aa7876e25..b961c026a4 100644 --- a/docs/manual/mod/mod_alias.xml.ja +++ b/docs/manual/mod/mod_alias.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 151408:1673892 (outdated) --> +<!-- English Revision: 151408:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_alias.xml.ko b/docs/manual/mod/mod_alias.xml.ko index 02d35f164a..acf2bb37f8 100644 --- a/docs/manual/mod/mod_alias.xml.ko +++ b/docs/manual/mod/mod_alias.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ko.xsl"?> -<!-- English Revision: 151408:1673892 (outdated) --> +<!-- English Revision: 151408:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_alias.xml.tr b/docs/manual/mod/mod_alias.xml.tr index 1e379c7d73..bbdb160279 100644 --- a/docs/manual/mod/mod_alias.xml.tr +++ b/docs/manual/mod/mod_alias.xml.tr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.tr.xsl"?> -<!-- English Revision: 1174747:1673892 (outdated) --> +<!-- English Revision: 1174747:1673908 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/mod/mod_macro.html.en b/docs/manual/mod/mod_macro.html.en index d0ca761009..00e2792a8b 100644 --- a/docs/manual/mod/mod_macro.html.en +++ b/docs/manual/mod/mod_macro.html.en @@ -69,7 +69,7 @@ multiple similar virtual hosts:</p> ServerName $domain ServerAlias www.$domain - DocumentRoot /var/www/vhosts/$name + DocumentRoot "/var/www/vhosts/$name" ErrorLog /var/log/httpd/$name.error_log CustomLog /var/log/httpd/$name.access_log combined </VirtualHost> @@ -125,7 +125,7 @@ confusion, the longest possible parameter name is used.</p> surround the parameter in braces, to avoid confusion:</p> <pre class="prettyprint lang-config"><Macro DocRoot ${docroot}> - DocumentRoot /var/www/${docroot}/htdocs + DocumentRoot "/var/www/${docroot}/htdocs" </Macro></pre> @@ -147,7 +147,7 @@ dynamically-generated virtual hosts.</p> <VirtualHost *:$port> ServerName $host - DocumentRoot $dir + DocumentRoot "$dir" # Public document root <Directory "$dir"> diff --git a/docs/manual/mod/mod_macro.xml b/docs/manual/mod/mod_macro.xml index d0735e730f..00829cd2b7 100644 --- a/docs/manual/mod/mod_macro.xml +++ b/docs/manual/mod/mod_macro.xml @@ -55,7 +55,7 @@ multiple similar virtual hosts:</p> ServerName $domain ServerAlias www.$domain - DocumentRoot /var/www/vhosts/$name + DocumentRoot "/var/www/vhosts/$name" ErrorLog /var/log/httpd/$name.error_log CustomLog /var/log/httpd/$name.access_log combined </VirtualHost> @@ -114,7 +114,7 @@ surround the parameter in braces, to avoid confusion:</p> <highlight language="config"> <Macro DocRoot ${docroot}> - DocumentRoot /var/www/${docroot}/htdocs + DocumentRoot "/var/www/${docroot}/htdocs" </Macro> </highlight> @@ -137,7 +137,7 @@ dynamically-generated virtual hosts.</p> <VirtualHost *:$port> ServerName $host - DocumentRoot $dir + DocumentRoot "$dir" # Public document root <Directory "$dir"> diff --git a/docs/manual/mod/mod_rewrite.html.en b/docs/manual/mod/mod_rewrite.html.en index c59ca4b5a7..ef26e12bcd 100644 --- a/docs/manual/mod/mod_rewrite.html.en +++ b/docs/manual/mod/mod_rewrite.html.en @@ -141,7 +141,7 @@ URLs on the fly</td></tr> since the resource was not relative to the document root. This misconfiguration would normally cause the server to look for an "opt" directory under the document root.</p> -<pre class="prettyprint lang-config">DocumentRoot /var/www/example.com +<pre class="prettyprint lang-config">DocumentRoot "/var/www/example.com" AliasMatch "^/myapp" "/opt/myapp-1.2.3" <Directory "/opt/myapp-1.2.3"> RewriteEngine On diff --git a/docs/manual/mod/mod_rewrite.xml b/docs/manual/mod/mod_rewrite.xml index 05c715cbe6..deac92d367 100644 --- a/docs/manual/mod/mod_rewrite.xml +++ b/docs/manual/mod/mod_rewrite.xml @@ -409,7 +409,7 @@ URLs on the fly</description> misconfiguration would normally cause the server to look for an "opt" directory under the document root.</p> <highlight language="config"> -DocumentRoot /var/www/example.com +DocumentRoot "/var/www/example.com" AliasMatch "^/myapp" "/opt/myapp-1.2.3" <Directory "/opt/myapp-1.2.3"> RewriteEngine On diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index 1556328325..5b1bbde57e 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1668875:1673892 (outdated) --> +<!-- English Revision: 1668875:1673908 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_vhost_alias.html.en b/docs/manual/mod/mod_vhost_alias.html.en index c7d0657cb9..3d88bbf10c 100644 --- a/docs/manual/mod/mod_vhost_alias.html.en +++ b/docs/manual/mod/mod_vhost_alias.html.en @@ -48,8 +48,8 @@ hosting</td></tr> /cgi-bin/script.pl</code> to <code> /usr/local/apache2/cgi-bin/script.pl</code> in all cases:</p> - <pre class="prettyprint lang-config">ScriptAlias /cgi-bin/ /usr/local/apache2/cgi-bin/ -VirtualScriptAlias /never/found/%0/cgi-bin/</pre> + <pre class="prettyprint lang-config">ScriptAlias "/cgi-bin/" "/usr/local/apache2/cgi-bin/" +VirtualScriptAlias "/never/found/%0/cgi-bin/"</pre> </div> </div> @@ -143,7 +143,7 @@ VirtualScriptAlias /never/found/%0/cgi-bin/</pre> following directives in your server configuration file:</p> <pre class="prettyprint lang-config">UseCanonicalName Off -VirtualDocumentRoot /usr/local/apache/vhosts/%0</pre> +VirtualDocumentRoot "/usr/local/apache/vhosts/%0"</pre> <p>A request for @@ -158,7 +158,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%0</pre> following in your configuration file:</p> <pre class="prettyprint lang-config">UseCanonicalName Off -VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2</pre> +VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2"</pre> <p>A request for @@ -169,7 +169,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2</pre> <p>A more even spread of files can be achieved by hashing from the end of the name, for example: </p> -<pre class="prettyprint lang-config">VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2</pre> +<pre class="prettyprint lang-config">VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.-1/%2.-2/%2.-3/%2"</pre> <p>The example request would come from @@ -177,7 +177,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2</pre> <p>Alternatively you might use: </p> -<pre class="prettyprint lang-config">VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+</pre> +<pre class="prettyprint lang-config">VirtualDocumentRoot "/usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2.4+"</pre> <p>The example request would come from @@ -205,8 +205,8 @@ or <code>example.com</code> will all point to <code>/usr/local/apache/vhosts/exa your configuration file:</p> <pre class="prettyprint lang-config">UseCanonicalName DNS -VirtualDocumentRootIP /usr/local/apache/vhosts/%1/%2/%3/%4/docs -VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin</pre> +VirtualDocumentRootIP "/usr/local/apache/vhosts/%1/%2/%3/%4/docs" +VirtualScriptAliasIP "/usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin"</pre> <p>A request for @@ -224,7 +224,7 @@ VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin</pre> a <code>%</code> directive, you can work around the problem in the following way:</p> -<pre class="prettyprint lang-config">VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0</pre> + <pre class="prettyprint lang-config">VirtualDocumentRoot "/usr/local/apache/vhosts/%2.0.%3.0"</pre> <p>A request for diff --git a/docs/manual/mod/mod_vhost_alias.xml b/docs/manual/mod/mod_vhost_alias.xml index 4b7eb17c22..c70950b53f 100644 --- a/docs/manual/mod/mod_vhost_alias.xml +++ b/docs/manual/mod/mod_vhost_alias.xml @@ -45,8 +45,8 @@ hosting</description> /usr/local/apache2/cgi-bin/script.pl</code> in all cases:</p> <highlight language="config"> -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/" </highlight> </note> </summary> @@ -128,7 +128,7 @@ VirtualScriptAlias /never/found/%0/cgi-bin/ <highlight language="config"> UseCanonicalName Off -VirtualDocumentRoot /usr/local/apache/vhosts/%0 +VirtualDocumentRoot "/usr/local/apache/vhosts/%0" </highlight> <p>A request for @@ -144,7 +144,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%0 <highlight language="config"> 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" </highlight> <p>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: </p> <highlight language="config"> - 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" </highlight> <p>The example request would come from @@ -165,7 +165,7 @@ VirtualDocumentRoot /usr/local/apache/vhosts/%3+/%2.1/%2.2/%2.3/%2 <p>Alternatively you might use: </p> <highlight language="config"> - 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+" </highlight> <p>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: </p> <highlight language="config"> - VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0" +VirtualDocumentRoot "/usr/local/apache/vhosts/%-2.0.%-1.0" </highlight> <p> In the example above, both <code>www.example.com</code> as well as <code>www.sub.example.com</code> @@ -195,8 +195,8 @@ or <code>example.com</code> will all point to <code>/usr/local/apache/vhosts/exa <highlight language="config"> 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" </highlight> <p>A request for @@ -214,9 +214,9 @@ VirtualScriptAliasIP /usr/local/apache/vhosts/%1/%2/%3/%4/cgi-bin a <code>%</code> directive, you can work around the problem in the following way:</p> -<highlight language="config"> - VirtualDocumentRoot /usr/local/apache/vhosts/%2.0.%3.0 -</highlight> + <highlight language="config"> +VirtualDocumentRoot "/usr/local/apache/vhosts/%2.0.%3.0" + </highlight> <p>A request for <code>http://www.domain.example.com/directory/file.html</code> diff --git a/docs/manual/rewrite/flags.html.fr b/docs/manual/rewrite/flags.html.fr index c30df7093c..480d8b9a40 100644 --- a/docs/manual/rewrite/flags.html.fr +++ b/docs/manual/rewrite/flags.html.fr @@ -24,6 +24,8 @@ <p><span>Langues Disponibles: </span><a href="../en/rewrite/flags.html" hreflang="en" rel="alternate" title="English"> en </a> | <a href="../fr/rewrite/flags.html" title="Français"> fr </a></p> </div> +<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.</div> <p>Ce document décrit les drapeaux disponibles dans la directive <code class="directive"><a href="../mod/mod_rewrite.html#rewriterule">RewriteRule</a></code>, en fournissant diff --git a/docs/manual/rewrite/flags.xml.fr b/docs/manual/rewrite/flags.xml.fr index 4ed3801dac..b7a5457047 100644 --- a/docs/manual/rewrite/flags.xml.fr +++ b/docs/manual/rewrite/flags.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1585159 --> +<!-- English Revision: 1585159:1673908 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/rewrite/flags.xml.meta b/docs/manual/rewrite/flags.xml.meta index 912229af03..e4f3ee6f49 100644 --- a/docs/manual/rewrite/flags.xml.meta +++ b/docs/manual/rewrite/flags.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> diff --git a/docs/manual/sections.xml.fr b/docs/manual/sections.xml.fr index e376d5a29f..d2176b68ca 100644 --- a/docs/manual/sections.xml.fr +++ b/docs/manual/sections.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1636195:1673892 (outdated) --> +<!-- English Revision: 1636195:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/sections.xml.ja b/docs/manual/sections.xml.ja index f6502a4619..8de16a1a57 100644 --- a/docs/manual/sections.xml.ja +++ b/docs/manual/sections.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?> -<!-- English Revision: 420990:1673892 (outdated) --> +<!-- English Revision: 420990:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/sections.xml.ko b/docs/manual/sections.xml.ko index 158e8bf3e3..bcf0582b4e 100644 --- a/docs/manual/sections.xml.ko +++ b/docs/manual/sections.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?> -<!-- English Revision: 105989:1673892 (outdated) --> +<!-- English Revision: 105989:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/sections.xml.tr b/docs/manual/sections.xml.tr index d7855db109..50c367941b 100644 --- a/docs/manual/sections.xml.tr +++ b/docs/manual/sections.xml.tr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?> -<!-- English Revision: 1300910:1673892 (outdated) --> +<!-- English Revision: 1300910:1673908 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/urlmapping.html.fr b/docs/manual/urlmapping.html.fr index 0ef081ea4e..c91152ff03 100644 --- a/docs/manual/urlmapping.html.fr +++ b/docs/manual/urlmapping.html.fr @@ -27,6 +27,8 @@ <a href="./ko/urlmapping.html" hreflang="ko" rel="alternate" title="Korean"> ko </a> | <a href="./tr/urlmapping.html" hreflang="tr" rel="alternate" title="Türkçe"> tr </a></p> </div> +<div class="outofdate">Cette traduction peut être périmée. Vérifiez la version + anglaise pour les changements récents.</div> <p>Ce document explique comment le serveur HTTP Apache utilise l'URL contenue dans une requête pour déterminer le noeud du système de fichier à partir duquel le diff --git a/docs/manual/urlmapping.xml.fr b/docs/manual/urlmapping.xml.fr index 6c1272f939..1fda9e5b78 100644 --- a/docs/manual/urlmapping.xml.fr +++ b/docs/manual/urlmapping.xml.fr @@ -3,7 +3,7 @@ <?xml-stylesheet type="text/xsl" href="./style/manual.fr.xsl"?> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> -<!-- English Revision: 1561569 --> +<!-- English Revision: 1561569:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.ja b/docs/manual/urlmapping.xml.ja index 2ff9411173..7b1068a051 100644 --- a/docs/manual/urlmapping.xml.ja +++ b/docs/manual/urlmapping.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ja.xsl"?> -<!-- English Revision: 151408:1561569 (outdated) --> +<!-- English Revision: 151408:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.ko b/docs/manual/urlmapping.xml.ko index 17d27ab75f..f70e92a240 100644 --- a/docs/manual/urlmapping.xml.ko +++ b/docs/manual/urlmapping.xml.ko @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="EUC-KR" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.ko.xsl"?> -<!-- English Revision: 151408:1561569 (outdated) --> +<!-- English Revision: 151408:1673908 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/urlmapping.xml.meta b/docs/manual/urlmapping.xml.meta index 9fd5f4bb52..02fc1a16aa 100644 --- a/docs/manual/urlmapping.xml.meta +++ b/docs/manual/urlmapping.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> <variant outdated="yes">ko</variant> <variant outdated="yes">tr</variant> diff --git a/docs/manual/urlmapping.xml.tr b/docs/manual/urlmapping.xml.tr index dc26710519..f48a1d4efa 100644 --- a/docs/manual/urlmapping.xml.tr +++ b/docs/manual/urlmapping.xml.tr @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE manualpage SYSTEM "./style/manualpage.dtd"> <?xml-stylesheet type="text/xsl" href="./style/manual.tr.xsl"?> -<!-- English Revision: 1310494:1561569 (outdated) --> +<!-- English Revision: 1310494:1673908 (outdated) --> <!-- ===================================================== Translated by: Nilgün Belma Bugüner <nilgun belgeler.org> Reviewed by: Orhan Berent <berent belgeler.org> diff --git a/docs/manual/vhosts/examples.html.en b/docs/manual/vhosts/examples.html.en index c38dbbc861..6b106770f1 100644 --- a/docs/manual/vhosts/examples.html.en +++ b/docs/manual/vhosts/examples.html.en @@ -80,14 +80,14 @@ <pre class="prettyprint lang-config"># Ensure that Apache listens on port 80 Listen 80 <VirtualHost *:80> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com # Other directives here </VirtualHost> <VirtualHost *:80> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # Other directives here @@ -143,17 +143,17 @@ Listen 80 # This is the "main" server running on 172.20.30.40 ServerName server.example.com -DocumentRoot /www/mainserver +DocumentRoot "/www/mainserver" <VirtualHost 172.20.30.50> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com # Other directives here ... </VirtualHost> <VirtualHost 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # Other directives here ... @@ -184,7 +184,7 @@ DocumentRoot /www/mainserver section.</p> <pre class="prettyprint lang-config"><VirtualHost 192.168.1.1 172.20.30.40> - DocumentRoot /www/server1 + DocumentRoot "/www/server1" ServerName server.example.com ServerAlias server </VirtualHost></pre> @@ -219,22 +219,22 @@ Listen 8080 <VirtualHost 172.20.30.40:80> ServerName www.example.com - DocumentRoot /www/domain-80 + DocumentRoot "/www/domain-80" </VirtualHost> <VirtualHost 172.20.30.40:8080> ServerName www.example.com - DocumentRoot /www/domain-8080 + DocumentRoot "/www/domain-8080" </VirtualHost> <VirtualHost 172.20.30.40:80> ServerName www.example.org - DocumentRoot /www/otherdomain-80 + DocumentRoot "/www/otherdomain-80" </VirtualHost> <VirtualHost 172.20.30.40:8080> ServerName www.example.org - DocumentRoot /www/otherdomain-8080 + DocumentRoot "/www/otherdomain-8080" </VirtualHost></pre> @@ -250,12 +250,12 @@ Listen 8080 <pre class="prettyprint lang-config">Listen 80 <VirtualHost 172.20.30.40> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org </VirtualHost></pre> @@ -282,22 +282,22 @@ Listen 172.20.30.50:80 Listen 172.20.30.50:8080 <VirtualHost 172.20.30.40:80> - DocumentRoot /www/example1-80 + DocumentRoot "/www/example1-80" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.40:8080> - DocumentRoot /www/example1-8080 + DocumentRoot "/www/example1-8080" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.50:80> - DocumentRoot /www/example2-80 + DocumentRoot "/www/example2-80" ServerName www.example.org </VirtualHost> <VirtualHost 172.20.30.50:8080> - DocumentRoot /www/example2-8080 + DocumentRoot "/www/example2-8080" ServerName www.example.org </VirtualHost></pre> @@ -312,28 +312,28 @@ Listen 172.20.30.50:8080 <pre class="prettyprint lang-config">Listen 80 <VirtualHost 172.20.30.40> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example3 + DocumentRoot "/www/example3" ServerName www.example.net </VirtualHost> # IP-based <VirtualHost 172.20.30.50> - DocumentRoot /www/example4 + DocumentRoot "/www/example4" ServerName www.example.edu </VirtualHost> <VirtualHost 172.20.30.60> - DocumentRoot /www/example5 + DocumentRoot "/www/example5" ServerName www.example.gov </VirtualHost></pre> @@ -372,7 +372,7 @@ Listen 172.20.30.50:8080 any other virtual host.</p> <pre class="prettyprint lang-config"><VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" </VirtualHost></pre> @@ -397,12 +397,12 @@ Listen 172.20.30.50:8080 to use a second <code>_default_</code> vhost for port 80.</p> <pre class="prettyprint lang-config"><VirtualHost _default_:80> - DocumentRoot /www/default80 + DocumentRoot "/www/default80" # ... </VirtualHost> <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" # ... </VirtualHost></pre> @@ -420,7 +420,7 @@ Listen 172.20.30.50:8080 vhosts.</p> <pre class="prettyprint lang-config"><VirtualHost _default_:80> -DocumentRoot /www/default + DocumentRoot "/www/default" ... </VirtualHost></pre> @@ -452,16 +452,16 @@ DocumentRoot /www/default <pre class="prettyprint lang-config">Listen 80 ServerName www.example.com -DocumentRoot /www/example1 +DocumentRoot "/www/example1" <VirtualHost 172.20.30.40 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # ... </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example3 + DocumentRoot "/www/example3" ServerName www.example.net ServerAlias *.example.net # ... @@ -488,14 +488,14 @@ DocumentRoot /www/example1 <pre class="prettyprint lang-config"><VirtualHost 172.20.30.40> # primary vhost - DocumentRoot /www/subdomain + DocumentRoot "/www/subdomain" RewriteEngine On RewriteRule . /www/subdomain/index.html # ... </VirtualHost> <VirtualHost 172.20.30.40> -DocumentRoot /www/subdomain/sub1 + DocumentRoot "/www/subdomain/sub1" ServerName www.sub1.domain.tld ServerPath /sub1/ RewriteEngine On @@ -504,7 +504,7 @@ DocumentRoot /www/subdomain/sub1 </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/subdomain/sub2 + DocumentRoot "/www/subdomain/sub2" ServerName www.sub2.domain.tld ServerPath /sub2/ RewriteEngine On diff --git a/docs/manual/vhosts/examples.xml b/docs/manual/vhosts/examples.xml index 0ea1ec5a44..0fe2261e44 100644 --- a/docs/manual/vhosts/examples.xml +++ b/docs/manual/vhosts/examples.xml @@ -56,14 +56,14 @@ # Ensure that Apache listens on port 80 Listen 80 <VirtualHost *:80> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com # Other directives here </VirtualHost> <VirtualHost *:80> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # Other directives here @@ -120,17 +120,17 @@ Listen 80 # This is the "main" server running on 172.20.30.40 ServerName server.example.com -DocumentRoot /www/mainserver +DocumentRoot "/www/mainserver" <VirtualHost 172.20.30.50> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com # Other directives here ... </VirtualHost> <VirtualHost 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # Other directives here ... @@ -162,7 +162,7 @@ DocumentRoot /www/mainserver <highlight language="config"> <VirtualHost 192.168.1.1 172.20.30.40> - DocumentRoot /www/server1 + DocumentRoot "/www/server1" ServerName server.example.com ServerAlias server </VirtualHost> @@ -198,22 +198,22 @@ Listen 8080 <VirtualHost 172.20.30.40:80> ServerName www.example.com - DocumentRoot /www/domain-80 + DocumentRoot "/www/domain-80" </VirtualHost> <VirtualHost 172.20.30.40:8080> ServerName www.example.com - DocumentRoot /www/domain-8080 + DocumentRoot "/www/domain-8080" </VirtualHost> <VirtualHost 172.20.30.40:80> ServerName www.example.org - DocumentRoot /www/otherdomain-80 + DocumentRoot "/www/otherdomain-80" </VirtualHost> <VirtualHost 172.20.30.40:8080> ServerName www.example.org - DocumentRoot /www/otherdomain-8080 + DocumentRoot "/www/otherdomain-8080" </VirtualHost> </highlight> @@ -230,12 +230,12 @@ Listen 8080 Listen 80 <VirtualHost 172.20.30.40> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org </VirtualHost> </highlight> @@ -263,22 +263,22 @@ Listen 172.20.30.50:80 Listen 172.20.30.50:8080 <VirtualHost 172.20.30.40:80> - DocumentRoot /www/example1-80 + DocumentRoot "/www/example1-80" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.40:8080> - DocumentRoot /www/example1-8080 + DocumentRoot "/www/example1-8080" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.50:80> - DocumentRoot /www/example2-80 + DocumentRoot "/www/example2-80" ServerName www.example.org </VirtualHost> <VirtualHost 172.20.30.50:8080> - DocumentRoot /www/example2-8080 + DocumentRoot "/www/example2-8080" ServerName www.example.org </VirtualHost> </highlight> @@ -294,28 +294,28 @@ Listen 172.20.30.50:8080 <highlight language="config"> Listen 80 <VirtualHost 172.20.30.40> - DocumentRoot /www/example1 + DocumentRoot "/www/example1" ServerName www.example.com </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example3 + DocumentRoot "/www/example3" ServerName www.example.net </VirtualHost> # IP-based <VirtualHost 172.20.30.50> - DocumentRoot /www/example4 + DocumentRoot "/www/example4" ServerName www.example.edu </VirtualHost> <VirtualHost 172.20.30.60> - DocumentRoot /www/example5 + DocumentRoot "/www/example5" ServerName www.example.gov </VirtualHost> </highlight> @@ -357,7 +357,7 @@ Listen 80 <highlight language="config"> <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" </VirtualHost> </highlight> @@ -383,12 +383,12 @@ Listen 80 <highlight language="config"> <VirtualHost _default_:80> - DocumentRoot /www/default80 + DocumentRoot "/www/default80" # ... </VirtualHost> <VirtualHost _default_:*> - DocumentRoot /www/default + DocumentRoot "/www/default" # ... </VirtualHost> </highlight> @@ -407,7 +407,7 @@ Listen 80 <highlight language="config"> <VirtualHost _default_:80> -DocumentRoot /www/default + DocumentRoot "/www/default" ... </VirtualHost> </highlight> @@ -441,16 +441,16 @@ DocumentRoot /www/default <highlight language="config"> Listen 80 ServerName www.example.com -DocumentRoot /www/example1 +DocumentRoot "/www/example1" <VirtualHost 172.20.30.40 172.20.30.50> - DocumentRoot /www/example2 + DocumentRoot "/www/example2" ServerName www.example.org # ... </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/example3 + DocumentRoot "/www/example3" ServerName www.example.net ServerAlias *.example.net # ... @@ -478,14 +478,14 @@ DocumentRoot /www/example1 <highlight language="config"> <VirtualHost 172.20.30.40> # primary vhost - DocumentRoot /www/subdomain + DocumentRoot "/www/subdomain" RewriteEngine On RewriteRule . /www/subdomain/index.html # ... </VirtualHost> <VirtualHost 172.20.30.40> -DocumentRoot /www/subdomain/sub1 + DocumentRoot "/www/subdomain/sub1" ServerName www.sub1.domain.tld ServerPath /sub1/ RewriteEngine On @@ -494,7 +494,7 @@ DocumentRoot /www/subdomain/sub1 </VirtualHost> <VirtualHost 172.20.30.40> - DocumentRoot /www/subdomain/sub2 + DocumentRoot "/www/subdomain/sub2" ServerName www.sub2.domain.tld ServerPath /sub2/ RewriteEngine On diff --git a/docs/manual/vhosts/mass.html.en b/docs/manual/vhosts/mass.html.en index e68b0e2a28..527fe56bc7 100644 --- a/docs/manual/vhosts/mass.html.en +++ b/docs/manual/vhosts/mass.html.en @@ -58,20 +58,20 @@ mod_rewrite</a></li> <pre class="prettyprint lang-config"><VirtualHost 111.22.33.44> ServerName customer-1.example.com - DocumentRoot /www/hosts/customer-1.example.com/docs - ScriptAlias /cgi-bin/ /www/hosts/customer-1.example.com/cgi-bin + DocumentRoot "/www/hosts/customer-1.example.com/docs" + ScriptAlias "/cgi-bin/" "/www/hosts/customer-1.example.com/cgi-bin" </VirtualHost> <VirtualHost 111.22.33.44> ServerName customer-2.example.com - DocumentRoot /www/hosts/customer-2.example.com/docs - ScriptAlias /cgi-bin/ /www/hosts/customer-2.example.com/cgi-bin + DocumentRoot "/www/hosts/customer-2.example.com/docs" + ScriptAlias "/cgi-bin/" "/www/hosts/customer-2.example.com/cgi-bin" </VirtualHost> <VirtualHost 111.22.33.44> ServerName customer-N.example.com - DocumentRoot /www/hosts/customer-N.example.com/docs - ScriptAlias /cgi-bin/ /www/hosts/customer-N.example.com/cgi-bin + DocumentRoot "/www/hosts/customer-N.example.com/docs" + ScriptAlias "/cgi-bin/" "/www/hosts/customer-N.example.com/cgi-bin" </VirtualHost></pre> @@ -166,8 +166,8 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log vcommon # include the server name in the filenames used to satisfy requests -VirtualDocumentRoot /www/hosts/%0/docs -VirtualScriptAlias /www/hosts/%0/cgi-bin</pre> +VirtualDocumentRoot "/www/hosts/%0/docs" +VirtualScriptAlias "/www/hosts/%0/cgi-bin"</pre> <p>This configuration can be changed into an IP-based virtual @@ -199,10 +199,10 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log vcommon # include part of the server name in the filenames -VirtualDocumentRoot /home/%2/www +VirtualDocumentRoot "/home/%2/www" # single cgi-bin directory -ScriptAlias /cgi-bin/ /www/std-cgi/</pre> +ScriptAlias "/cgi-bin/" "/www/std-cgi/"</pre> <p>There are examples of more complicated @@ -242,8 +242,8 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log.commercial vcommon - VirtualDocumentRoot /www/commercial/%0/docs - VirtualScriptAlias /www/commercial/%0/cgi-bin + VirtualDocumentRoot "/www/commercial/%0/docs" + VirtualScriptAlias "/www/commercial/%0/cgi-bin" </VirtualHost> <VirtualHost 111.22.33.45> @@ -251,8 +251,8 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log.homepages vcommon - VirtualDocumentRoot /www/homepages/%0/docs - ScriptAlias /cgi-bin/ /www/std-cgi/ + VirtualDocumentRoot "/www/homepages/%0/docs" + ScriptAlias "/cgi-bin/" "/www/std-cgi/" </VirtualHost></pre> @@ -287,8 +287,8 @@ LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log vcommon # include the IP address in the filenames -VirtualDocumentRootIP /www/hosts/%0/docs -VirtualScriptAliasIP /www/hosts/%0/cgi-bin</pre> +VirtualDocumentRootIP "/www/hosts/%0/docs" +VirtualScriptAliasIP "/www/hosts/%0/cgi-bin"</pre> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div> diff --git a/docs/manual/vhosts/mass.xml b/docs/manual/vhosts/mass.xml index 2bceeb8441..9ebe26dfa0 100644 --- a/docs/manual/vhosts/mass.xml +++ b/docs/manual/vhosts/mass.xml @@ -44,20 +44,20 @@ <highlight language="config"> <VirtualHost 111.22.33.44> ServerName customer-1.example.com - DocumentRoot /www/hosts/customer-1.example.com/docs - ScriptAlias /cgi-bin/ /www/hosts/customer-1.example.com/cgi-bin + DocumentRoot "/www/hosts/customer-1.example.com/docs" + ScriptAlias "/cgi-bin/" "/www/hosts/customer-1.example.com/cgi-bin" </VirtualHost> <VirtualHost 111.22.33.44> ServerName customer-2.example.com - DocumentRoot /www/hosts/customer-2.example.com/docs - ScriptAlias /cgi-bin/ /www/hosts/customer-2.example.com/cgi-bin + DocumentRoot "/www/hosts/customer-2.example.com/docs" + ScriptAlias "/cgi-bin/" "/www/hosts/customer-2.example.com/cgi-bin" </VirtualHost> <VirtualHost 111.22.33.44> ServerName customer-N.example.com - DocumentRoot /www/hosts/customer-N.example.com/docs - ScriptAlias /cgi-bin/ /www/hosts/customer-N.example.com/cgi-bin + DocumentRoot "/www/hosts/customer-N.example.com/docs" + ScriptAlias "/cgi-bin/" "/www/hosts/customer-N.example.com/cgi-bin" </VirtualHost> </highlight> @@ -157,8 +157,8 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log vcommon # include the server name in the filenames used to satisfy requests -VirtualDocumentRoot /www/hosts/%0/docs -VirtualScriptAlias /www/hosts/%0/cgi-bin +VirtualDocumentRoot "/www/hosts/%0/docs" +VirtualScriptAlias "/www/hosts/%0/cgi-bin" </highlight> <p>This configuration can be changed into an IP-based virtual @@ -191,10 +191,10 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log vcommon # include part of the server name in the filenames -VirtualDocumentRoot /home/%2/www +VirtualDocumentRoot "/home/%2/www" # single cgi-bin directory -ScriptAlias /cgi-bin/ /www/std-cgi/ +ScriptAlias "/cgi-bin/" "/www/std-cgi/" </highlight> <p>There are examples of more complicated @@ -235,8 +235,8 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log.commercial vcommon - VirtualDocumentRoot /www/commercial/%0/docs - VirtualScriptAlias /www/commercial/%0/cgi-bin + VirtualDocumentRoot "/www/commercial/%0/docs" + VirtualScriptAlias "/www/commercial/%0/cgi-bin" </VirtualHost> <VirtualHost 111.22.33.45> @@ -244,8 +244,8 @@ LogFormat "%V %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log.homepages vcommon - VirtualDocumentRoot /www/homepages/%0/docs - ScriptAlias /cgi-bin/ /www/std-cgi/ + VirtualDocumentRoot "/www/homepages/%0/docs" + ScriptAlias "/cgi-bin/" "/www/std-cgi/" </VirtualHost> </highlight> @@ -281,8 +281,8 @@ LogFormat "%A %h %l %u %t \"%r\" %s %b" vcommon CustomLog logs/access_log vcommon # include the IP address in the filenames -VirtualDocumentRootIP /www/hosts/%0/docs -VirtualScriptAliasIP /www/hosts/%0/cgi-bin +VirtualDocumentRootIP "/www/hosts/%0/docs" +VirtualScriptAliasIP "/www/hosts/%0/cgi-bin" </highlight> </section> diff --git a/docs/manual/vhosts/name-based.html.en b/docs/manual/vhosts/name-based.html.en index 9b2e7e93be..86bc837428 100644 --- a/docs/manual/vhosts/name-based.html.en +++ b/docs/manual/vhosts/name-based.html.en @@ -138,12 +138,12 @@ # This first-listed virtual host is also the default for *:80 ServerName www.example.com ServerAlias example.com - DocumentRoot /www/domain + DocumentRoot "/www/domain" </VirtualHost> <VirtualHost *:80> ServerName other.example.com - DocumentRoot /www/otherdomain + DocumentRoot "/www/otherdomain" </VirtualHost></pre> diff --git a/docs/manual/vhosts/name-based.xml b/docs/manual/vhosts/name-based.xml index c64df7e19d..91e2b5ed11 100644 --- a/docs/manual/vhosts/name-based.xml +++ b/docs/manual/vhosts/name-based.xml @@ -151,12 +151,12 @@ # This first-listed virtual host is also the default for *:80 ServerName www.example.com ServerAlias example.com - DocumentRoot /www/domain + DocumentRoot "/www/domain" </VirtualHost> <VirtualHost *:80> ServerName other.example.com - DocumentRoot /www/otherdomain + DocumentRoot "/www/otherdomain" </VirtualHost> </highlight> |