Skip to content

Commit befb523

Browse files
committed
Regenerate docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1930727 13f79535-47bb-0310-9956-ffa450edef68
1 parent d5b2934 commit befb523

File tree

4 files changed

+81
-31
lines changed

4 files changed

+81
-31
lines changed

docs/manual/mod/directives.html.en.utf8

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -481,6 +481,7 @@
481481
<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>
482482
<li><a href="mod_md.html#mdactivationdelay">MDActivationDelay</a></li>
483483
<li><a href="mod_md.html#mdbaseserver">MDBaseServer</a></li>
484+
<li><a href="mod_md.html#mdcacertificatefile">MDCACertificateFile</a></li>
484485
<li><a href="mod_md.html#mdcachallenges">MDCAChallenges</a></li>
485486
<li><a href="mod_md.html#mdcertificateagreement">MDCertificateAgreement</a></li>
486487
<li><a href="mod_md.html#mdcertificateauthority">MDCertificateAuthority</a></li>
@@ -497,6 +498,7 @@
497498
<li><a href="mod_md.html#mddrivemode">MDDriveMode</a></li>
498499
<li><a href="mod_md.html#mdexternalaccountbinding">MDExternalAccountBinding</a></li>
499500
<li><a href="mod_md.html#mdhttpproxy">MDHttpProxy</a></li>
501+
<li><a href="mod_md.html#mdinitialdelay">MDInitialDelay</a></li>
500502
<li><a href="mod_md.html#mdmatchnames">MDMatchNames</a></li>
501503
<li><a href="mod_md.html#mdmember">MDMember</a></li>
502504
<li><a href="mod_md.html#mdmembers">MDMembers</a></li>

docs/manual/mod/mod_md.html.en.utf8

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@
288288
<ul id="toc">
289289
<li><img alt="" src="../images/down.gif" /> <a href="#mdactivationdelay">MDActivationDelay</a></li>
290290
<li><img alt="" src="../images/down.gif" /> <a href="#mdbaseserver">MDBaseServer</a></li>
291+
<li><img alt="" src="../images/down.gif" /> <a href="#mdcacertificatefile">MDCACertificateFile</a></li>
291292
<li><img alt="" src="../images/down.gif" /> <a href="#mdcachallenges">MDCAChallenges</a></li>
292293
<li><img alt="" src="../images/down.gif" /> <a href="#mdcertificateagreement">MDCertificateAgreement</a></li>
293294
<li><img alt="" src="../images/down.gif" /> <a href="#mdcertificateauthority">MDCertificateAuthority</a></li>
@@ -304,6 +305,7 @@
304305
<li><img alt="" src="../images/down.gif" /> <a href="#mddrivemode">MDDriveMode</a></li>
305306
<li><img alt="" src="../images/down.gif" /> <a href="#mdexternalaccountbinding">MDExternalAccountBinding</a></li>
306307
<li><img alt="" src="../images/down.gif" /> <a href="#mdhttpproxy">MDHttpProxy</a></li>
308+
<li><img alt="" src="../images/down.gif" /> <a href="#mdinitialdelay">MDInitialDelay</a></li>
307309
<li><img alt="" src="../images/down.gif" /> <a href="#mdmatchnames">MDMatchNames</a></li>
308310
<li><img alt="" src="../images/down.gif" /> <a href="#mdmember">MDMember</a></li>
309311
<li><img alt="" src="../images/down.gif" /> <a href="#mdmembers">MDMembers</a></li>
@@ -366,6 +368,27 @@
366368
for all managed domains and do not rely on the global, fallback server configuration.
367369
</p>
368370

371+
</div>
372+
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
373+
<div class="directive-section"><h2><a name="MDCACertificateFile" id="MDCACertificateFile">MDCACertificateFile</a> <a name="mdcacertificatefile" id="mdcacertificatefile">Directive</a> <a title="Permanent link" href="#mdcacertificatefile" class="permalink">&para;</a></h2>
374+
<table class="directive">
375+
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>File containing x509 trust anchors to verify ACME servers.</td></tr>
376+
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MDCACertificateFile <var>file</var></code></td></tr>
377+
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MDCACertificateFile none</code></td></tr>
378+
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
379+
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
380+
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_md</td></tr>
381+
</table>
382+
<p>
383+
This is mainly used in test setups where the module needs to
384+
connect to a test ACME server that has its own root certificate.
385+
People who run an enterprise wide internal CA can use this when
386+
they run their own ACME servers.
387+
</p>
388+
<p>
389+
Use "none" as path to disable explicitly.
390+
</p>
391+
369392
</div>
370393
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
371394
<div class="directive-section"><h2><a name="MDCAChallenges" id="MDCAChallenges">MDCAChallenges</a> <a name="mdcachallenges" id="mdcachallenges">Directive</a> <a title="Permanent link" href="#mdcachallenges" class="permalink">&para;</a></h2>
@@ -756,6 +779,23 @@
756779
if your webserver can only reach the internet with a forward proxy.
757780
</p>
758781

782+
</div>
783+
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
784+
<div class="directive-section"><h2><a name="MDInitialDelay" id="MDInitialDelay">MDInitialDelay</a> <a name="mdinitialdelay" id="mdinitialdelay">Directive</a> <a title="Permanent link" href="#mdinitialdelay" class="permalink">&para;</a></h2>
785+
<table class="directive">
786+
<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>How long to delay the first certificate check.</td></tr>
787+
<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MDInitialDelay <var>duration</var></code></td></tr>
788+
<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MDInitialDelay 0s</code></td></tr>
789+
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
790+
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Experimental</td></tr>
791+
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_md</td></tr>
792+
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4.66 and later</td></tr>
793+
</table>
794+
<p>
795+
The amount of time to wait after the server start to check
796+
renewals of certificates. By default this occurs right away.
797+
</p>
798+
759799
</div>
760800
<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
761801
<div class="directive-section"><h2><a name="MDMatchNames" id="MDMatchNames">MDMatchNames</a> <a name="mdmatchnames" id="mdmatchnames">Directive</a> <a title="Permanent link" href="#mdmatchnames" class="permalink">&para;</a></h2>

docs/manual/mod/mod_ssl.html.en.utf8

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3045,8 +3045,8 @@ known to the server (i.e. the CA's certificate is under
30453045
<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config</td></tr>
30463046
<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>
30473047
<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_ssl</td></tr>
3048-
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.5 and later</td></tr>
3049-
</table><p>This directive sets policy applied when checking whether the
3048+
<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in httpd 2.4.66 and later</td></tr>
3049+
</table><p>This directive sets the policy applied when checking whether the
30503050
<code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code>
30513051
identified by the <code>Host</code> request header in an HTTP request
30523052
is compatible with the <code class="directive"><a href="../mod/core.html#virtualhost">&lt;VirtualHost&gt;</a></code> identified from the SNI
@@ -3055,6 +3055,12 @@ request is associated with a virtual host which has an incompatible
30553055
SSL/TLS configuration under the policy used, an HTTP error response
30563056
with status code 421 ("Misdirected Request") will be sent.</p>
30573057

3058+
<p>The policy also applies to TLS connections where an SNI extension
3059+
is not sent during the handshake, implicitly using the default or
3060+
first virtual host definition. If the Host header in an HTTP request
3061+
on such a connection identifies any other non-default virtual host,
3062+
the compatibility policy is tested.</p>
3063+
30583064
<p>The <code>strict</code> policy blocks all HTTP requests which are
30593065
identified with a different virtual host to that identifed by SNI.
30603066
The <code>insecure</code> policy allows all HTTP requests regardless
@@ -3064,43 +3070,43 @@ of virtual host identified; such a configuration may be vulnerable to
30643070

30653071
<p>The (default) <code>secure</code>, and <code>authonly</code>
30663072
policies compare specific aspects of the SSL configuration for the two
3067-
virtual hosts, which are grouped into two categories:
3073+
virtual hosts, which are grouped into two categories:</p>
30683074

30693075
<ul>
3070-
<li><strong>client vertification and authentication
3071-
settings</strong>: directives which affect TLS client certificate
3072-
verification or authentication, such as <code class="directive"><a href="#sslverifyclient">SSLVerifyClient</a></code>, <code class="directive"><a href="#sslverifymode">SSLVerifyMode</a></code>, <code class="directive"><a href="#sslcacertificatepath">SSLCACertificatePath</a></code>, <code class="directive"><a href="#sslsrpverifierfile">SSLSRPVerifierFile</a></code>; any use of <code class="directive"><a href="#sslopensslconfcmd">SSLOpenSSLConfCmd</a></code></li>
3073-
30743076
<li><strong>server certificate/key, or protocol/cipher
30753077
restrictions</strong>: directives which determine the server
30763078
certificate or key (<code class="directive"><a href="#sslcertificatekeyfile">SSLCertificateKeyFile</a></code> etc), cipher or
30773079
protocol restrictions (<code class="directive"><a href="#sslciphersuite">SSLCipherSuite</a></code> and <code class="directive"><a href="#sslprotocol">SSLProtocol</a></code>)</li>
3080+
3081+
<li><strong>client vertification and authentication
3082+
settings</strong>: directives which affect TLS client certificate
3083+
verification or authentication, such as <code class="directive"><a href="#sslverifyclient">SSLVerifyClient</a></code>, <code class="directive"><a href="#sslverifymode">SSLVerifyMode</a></code>, <code class="directive"><a href="#sslcacertificatepath">SSLCACertificatePath</a></code>, <code class="directive"><a href="#sslsrpverifierfile">SSLSRPVerifierFile</a></code>; any use of <code class="directive"><a href="#sslopensslconfcmd">SSLOpenSSLConfCmd</a></code></li>
30783084
</ul>
30793085

3080-
This table illustrates whether an HTTP request will be blocked or
3086+
<p>This table illustrates whether an HTTP request will be blocked or
30813087
allowed when the virtual host configurations differ as described,
3082-
under each different policy setting:
3088+
under each different policy setting:</p>
30833089

30843090
<table class="bordered"><tr class="header">
30853091
<th>Policy mode</th>
30863092
<th>Any VirtualHost mismatch</th>
3087-
<th>Client verification/<br />authentication settings</th>
30883093
<th>Server certificate/key, <br />or protocol/cipher restrictions</th>
3094+
<th>Client verification/<br />authentication settings</th>
30893095
</tr>
30903096
<tr>
3091-
<td><code>strict</code><td>blocked</td><td>blocked</td><td>blocked</td></td>
3097+
<td><code>strict</code></td><td>blocked</td><td>blocked</td><td>blocked</td>
30923098
</tr>
30933099
<tr class="odd">
3094-
<td><code>secure</code><td>allowed</td><td>blocked</td><td>blocked</td></td>
3100+
<td><code>secure</code></td><td>allowed</td><td>blocked</td><td>blocked</td>
30953101
</tr>
30963102
<tr>
3097-
<td><code>authonly</code><td>allowed</td><td>blocked</td><td>allowed</td></td>
3103+
<td><code>authonly</code></td><td>allowed</td><td>allowed</td><td>blocked</td>
30983104
</tr>
30993105
<tr class="odd">
3100-
<td><code>insecure</code><td>allowed</td><td>allowed</td><td>allowed</td></td>
3106+
<td><code>insecure</code></td><td>allowed</td><td>allowed</td><td>allowed</td>
31013107
</tr>
31023108
</table>
3103-
</p>
3109+
31043110
<div class="example"><h3>Example</h3><pre class="prettyprint lang-config">SSLVHostSNIPolicy authonly</pre>
31053111
</div>
31063112

0 commit comments

Comments
 (0)