You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2018/05/31 15:13:38 UTC
svn commit: r1832625 [1/2] - in /httpd/httpd/branches/2.4.x/docs/manual/mod:
core.html.en core.xml.de core.xml.es core.xml.fr core.xml.ja core.xml.meta
core.xml.tr directives.html.en overrides.html.en quickreference.html.en
Author: jorton
Date: Thu May 31 15:13:38 2018
New Revision: 1832625
URL: http://svn.apache.org/viewvc?rev=1832625&view=rev
Log:
Transforms.
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.de
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.es
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.tr
httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/overrides.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/quickreference.html.en
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.html.en Thu May 31 15:13:38 2018
@@ -74,7 +74,10 @@ available</td></tr>
<li><img alt="" src="../images/down.gif" /> <a href="#httpprotocoloptions">HttpProtocolOptions</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#if"><If></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ifdefine"><IfDefine></a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifdirective"><IfDirective></a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#iffile"><IfFile></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#ifmodule"><IfModule></a></li>
+<li><img alt="" src="../images/down.gif" /> <a href="#ifsection"><IfSection></a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#include">Include</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#includeoptional">IncludeOptional</a></li>
<li><img alt="" src="../images/down.gif" /> <a href="#keepalive">KeepAlive</a></li>
@@ -828,12 +831,12 @@ which no other media type configuration
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
</table>
- <p>In its one parameter form, <code class="directive">Define</code> is equivalent
- to passing the <code>-D</code> argument to <code class="program"><a href="../programs/httpd.html">httpd</a></code>. It
- can be used to toggle the use of
- <code class="directive"><a href="#ifdefine"><IfDefine></a></code> sections
- without needing to alter <code>-D</code> arguments in any startup
- scripts.</p>
+ <p>In its one parameter form, <code class="directive">Define</code> is
+ equivalent to passing the <code>-D</code> argument to
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code>. It can be used to toggle the use of
+ <code class="directive"><a href="#ifdefine"><IfDefine></a></code>
+ sections without needing to alter <code>-D</code> arguments in any
+ startup scripts.</p>
<p>In addition to that, if the second parameter is given, a config variable
is set to this value. The variable can be used in the configuration using
@@ -2253,6 +2256,88 @@ if a test is true at startup</td></tr>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfDirective" id="IfDirective"><IfDirective></a> <a name="ifdirective" id="ifdirective">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the
+presence or absence of a specific directive</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><IfDirective [!]<var>directive-name</var>> ...
+ </IfDirective></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in 2.4.34 and later.</td></tr>
+</table>
+ <p>The <code><IfDirective <var>test</var>>...</IfDirective></code>
+ section is used to mark directives that are conditional on the presence of
+ a specific directive. The directives within an <code class="directive"><IfDirective></code> section are only processed if the <var>test</var>
+ is true. If <var>test</var> is false, everything between the start and
+ end markers is ignored.</p>
+
+ <p>The <var>test</var> in the <code class="directive"><IfDirective></code> section can be one of two forms:</p>
+
+ <ul>
+ <li><var>directive-name</var></li>
+
+ <li>!<var>directive-name</var></li>
+ </ul>
+
+ <p>In the former case, the directives between the start and end
+ markers are only processed if a directive of the given name is
+ available at the time of processing. The second format reverses the test,
+ and only processes the directives if the <var>directive-name</var> is
+ <strong>not</strong> defined.</p>
+
+ <div class="note">This section should only be used if you need to have one
+ configuration file that works across multiple versions of
+ <code class="program"><a href="../programs/httpd.html">httpd</a></code>, regardless of whether a particular
+ directive is available. In normal operation, directives need not
+ be placed in <code class="directive"><IfDirective></code>
+ sections.</div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#ifsection"><IfSection></a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfFile" id="IfFile"><IfFile></a> <a name="iffile" id="iffile">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that will be processed only
+if file exists at startup</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><IfFile [!]<var>parameter-name</var>> ...
+ </IfFile></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in 2.4.34 and later.</td></tr>
+</table>
+ <p>The <code><IfFile <var>filename</var>>...</IfFile>
+ </code> section is used to mark directives that are conditional on
+ the existence of a file on disk. The directives within an
+ <code class="directive"><IfFile></code> section are only
+ processed if the <var>filename</var> exists. If <var> filename</var>
+ doesn't exist, everything between the start and end markers is
+ ignored. <var>filename</var> can be an absolute path or a path
+ relative to the server root.</p>
+
+ <p>The <var>filename</var> in the <code class="directive"><IfFile
+ ></code> section directive can take the same forms as the
+ <var>test</var> variable in the <code class="directive"><IfDefine
+ ></code> section, i.e. the test can be negated if the <code>
+ !</code> character is placed directly before <var>filename</var>.
+ </p>
+
+ <p>If a relative <var>filename</var> is supplied, the check is
+ <code class="directive">ServerRoot</code> relative. In the case where
+ this directive occurs before the <code class="directive">ServerRoot</code>,
+ the path will be checked relative to the compiled-in server root or
+ the server root passed in on the command line via the <code>-d</code>
+ parameter.</p>
+
+
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="IfModule" id="IfModule"><IfModule></a> <a name="ifmodule" id="ifmodule">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the
@@ -2306,6 +2391,64 @@ later.</td></tr>
</div>
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
+<div class="directive-section"><h2><a name="IfSection" id="IfSection"><IfSection></a> <a name="ifsection" id="ifsection">Directive</a></h2>
+<table class="directive">
+<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Encloses directives that are processed conditional on the
+presence or absence of a specific section directive</td></tr>
+<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code><IfSection [!]<var>section-name</var>> ...
+ </IfSection></code></td></tr>
+<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
+<tr><th><a href="directive-dict.html#Override">Override:</a></th><td>All</td></tr>
+<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Core</td></tr>
+<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>core</td></tr>
+<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in 2.4.34 and later.</td></tr>
+</table>
+ <p>The <code><IfSection
+ <var>test</var>>...</IfSection></code> section is used
+ to mark directives that are conditional on the presence of a
+ specific section directive. A section directive is any directive
+ such as <code class="directive"><virtualhost></code> which
+ encloses other directives, and has a directive name with a leading
+ "<". The sec
+
+ The directives within an <code class="directive"><IfSection></code> section are only processed if the <var>test</var>
+ is true. If <var>test</var> is false, everything between the start and
+ end markers is ignored.</p>
+
+ <p>The <var>section-name</var> specified must not include the
+ leading "<". The <var>test</var> in the <code class="directive"><IfSection></code> section can be one of two
+ forms:</p>
+
+ <ul>
+ <li><var>section-name</var></li>
+ <li>!<var>section-name</var></li>
+ </ul>
+
+ <p>In the former case, the directives between the start and
+ end markers are only processed if a section directive of the given
+ name is available at the time of processing. The second format
+ reverses the test, and only processes the directives if the
+ <var>section-name</var> is <strong>not</strong> defined.</p>
+
+ <p>For example:</p>
+
+ <pre class="prettyprint lang-config"><IfSection VirtualHost>
+ ...
+</IfSection></pre>
+
+
+ <div class="note">This section should only be used if you need to have one
+ configuration file that works across multiple versions of <code class="program"><a href="../programs/httpd.html">httpd</a></code>,
+ regardless of whether a particular section directive is
+ available. In normal operation, directives need not be placed in
+ <code class="directive"><IfSection></code> sections.</div>
+
+<h3>See also</h3>
+<ul>
+<li><code class="directive"><a href="#ifdirective"><IfDirective></a></code></li>
+</ul>
+</div>
+<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
<div class="directive-section"><h2><a name="Include" id="Include">Include</a> <a name="include" id="include">Directive</a></h2>
<table class="directive">
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Includes other configuration files from within
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.de?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.de Thu May 31 15:13:38 2018
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.de.xsl"?>
-<!-- English Revision: 344972:1828061 (outdated) -->
+<!-- English Revision: 344972:1832623 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.es
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.es?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.es [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.es [utf-8] Thu May 31 15:13:38 2018
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.es.xsl"?>
-<!-- English Revision: 1741251:1828061 (outdated) -->
+<!-- English Revision: 1741251:1832623 (outdated) -->
<!-- Translated by Luis Gil de Bernabé Pfeiffer lgilbernabe[AT]apache.org -->
<!-- Reviewed by Sergio Ramos-->
<!--
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.fr?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.fr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.fr [utf-8] Thu May 31 15:13:38 2018
@@ -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.fr.xsl"?>
-<!-- English Revision: 1828061 -->
+<!-- English Revision: 1828061:1832623 (outdated) -->
<!-- French translation : Lucien GENTIS -->
<!-- Reviewed by : Vincent Deffontaines -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.ja?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.ja [utf-8] Thu May 31 15:13:38 2018
@@ -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: 669847:1828061 (outdated) -->
+<!-- English Revision: 669847:1832623 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.meta?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.meta Thu May 31 15:13:38 2018
@@ -10,8 +10,8 @@
<variant outdated="yes">de</variant>
<variant>en</variant>
<variant outdated="yes">es</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
- <variant>tr</variant>
+ <variant outdated="yes">tr</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.tr?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml.tr [utf-8] Thu May 31 15:13:38 2018
@@ -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: 1828061 -->
+<!-- English Revision: 1828061:1832623 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/directives.html.en Thu May 31 15:13:38 2018
@@ -321,7 +321,10 @@
<li><a href="mod_ident.html#identitychecktimeout">IdentityCheckTimeout</a></li>
<li><a href="core.html#if"><If></a></li>
<li><a href="core.html#ifdefine"><IfDefine></a></li>
+<li><a href="core.html#ifdirective"><IfDirective></a></li>
+<li><a href="core.html#iffile"><IfFile></a></li>
<li><a href="core.html#ifmodule"><IfModule></a></li>
+<li><a href="core.html#ifsection"><IfSection></a></li>
<li><a href="mod_version.html#ifversion"><IfVersion></a></li>
<li><a href="mod_imagemap.html#imapbase">ImapBase</a></li>
<li><a href="mod_imagemap.html#imapdefault">ImapDefault</a></li>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/overrides.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/overrides.html.en?rev=1832625&r1=1832624&r2=1832625&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/overrides.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/overrides.html.en Thu May 31 15:13:38 2018
@@ -112,9 +112,15 @@ satisfied by a request at runtime</td></
<tr class="odd"><td><a href="core.html#ifdefine"><IfDefine></a></td><td class="module"><a href="core.html">core</a></td></tr>
<tr class="odd"><td colspan="2" class="descr">Encloses directives that will be processed only
if a test is true at startup</td></tr>
-<tr><td><a href="core.html#ifmodule"><IfModule></a></td><td class="module"><a href="core.html">core</a></td></tr>
+<tr><td><a href="core.html#ifdirective"><IfDirective></a></td><td class="module"><a href="core.html">core</a></td></tr>
<tr><td colspan="2" class="descr">Encloses directives that are processed conditional on the
+presence or absence of a specific directive</td></tr>
+<tr class="odd"><td><a href="core.html#ifmodule"><IfModule></a></td><td class="module"><a href="core.html">core</a></td></tr>
+<tr class="odd"><td colspan="2" class="descr">Encloses directives that are processed conditional on the
presence or absence of a specific module</td></tr>
+<tr><td><a href="core.html#ifsection"><IfSection></a></td><td class="module"><a href="core.html">core</a></td></tr>
+<tr><td colspan="2" class="descr">Encloses directives that are processed conditional on the
+presence or absence of a specific section directive</td></tr>
<tr class="odd"><td><a href="mod_version.html#ifversion"><IfVersion></a></td><td class="module"><a href="mod_version.html">mod_version</a></td></tr>
<tr class="odd"><td colspan="2" class="descr">contains version dependent configuration</td></tr>
<tr><td><a href="core.html#limitrequestbody">LimitRequestBody</a></td><td class="module"><a href="core.html">core</a></td></tr>