You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2014/05/03 14:33:29 UTC
svn commit: r1592193 - in /httpd/httpd/trunk/docs/manual: ./ howto/ mod/
Author: trawick
Date: Sat May 3 12:33:28 2014
New Revision: 1592193
URL: http://svn.apache.org/r1592193
Log:
rebuild docs
Modified:
httpd/httpd/trunk/docs/manual/expr.html.en
httpd/httpd/trunk/docs/manual/howto/public_html.xml.ja
httpd/httpd/trunk/docs/manual/howto/public_html.xml.ko
httpd/httpd/trunk/docs/manual/howto/public_html.xml.tr
httpd/httpd/trunk/docs/manual/mod/core.xml.de
httpd/httpd/trunk/docs/manual/mod/core.xml.es
httpd/httpd/trunk/docs/manual/mod/core.xml.ja
httpd/httpd/trunk/docs/manual/mod/core.xml.tr
httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en
httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_authz_host.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja
httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko
httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.meta
httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.html.en
httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de
httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja
httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.tr
httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
httpd/httpd/trunk/docs/manual/sections.xml.ja
httpd/httpd/trunk/docs/manual/sections.xml.ko
httpd/httpd/trunk/docs/manual/sections.xml.tr
Modified: httpd/httpd/trunk/docs/manual/expr.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/expr.html.en?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/expr.html.en (original)
+++ httpd/httpd/trunk/docs/manual/expr.html.en Sat May 3 12:33:28 2014
@@ -44,7 +44,7 @@
<li><img alt="" src="./images/down.gif" /> <a href="#other">Other</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#sslrequire">Comparison with SSLRequire</a></li>
<li><img alt="" src="./images/down.gif" /> <a href="#compatibility">Version History</a></li>
-</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if"><If></a></code></li><li><code class="directive"><a href="./mod/core.html#elseif"><ElseIf></a></code></li><li><code class="directive"><a href="./mod/core.html#else"><Else></a></code></li><li><code class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</
a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a href="mod/mod_authnz_ldap.html#reqfilter">Require ldap-filter</a></li><li><a href="mod/mod_authz_dbd.html#reqgroup">Require dbd-group</a></li><li><a href="mod/mod_authz_dbm.html#reqgroup">Require dbm-group</a></li><li><a href="mod/mod_authz_groupfile.html#reqgroup">Require group</a></li><li><a href="mod/mod_a
uthz_host.html#reqhost">Require host</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
+</ul><h3>See also</h3><ul class="seealso"><li><code class="directive"><a href="./mod/core.html#if"><If></a></code></li><li><code class="directive"><a href="./mod/core.html#elseif"><ElseIf></a></code></li><li><code class="directive"><a href="./mod/core.html#else"><Else></a></code></li><li><code class="directive"><a href="./mod/mod_auth_basic.html#authbasicfake">AuthBasicFake</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginrequiredlocation">AuthFormLoginRequiredLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformloginsuccesslocation">AuthFormLoginSuccessLocation</a></code></li><li><code class="directive"><a href="./mod/mod_auth_form.html#authformlogoutlocation">AuthFormLogoutLocation</a></code></li><li><code class="directive"><a href="./mod/mod_rewrite.html#rewritecond">RewriteCond</a></code></li><li><code class="directive"><a href="./mod/mod_setenvif.html#setenvifexpr">SetEnvIfExpr</
a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#header">Header</a></code></li><li><code class="directive"><a href="./mod/mod_headers.html#requestheader">RequestHeader</a></code></li><li><code class="directive"><a href="./mod/mod_filter.html#filterprovider">FilterProvider</a></code></li><li><a href="mod/mod_authz_core.html#reqexpr">Require expr</a></li><li><a href="mod/mod_authnz_ldap.html#requser">Require ldap-user</a></li><li><a href="mod/mod_authnz_ldap.html#reqgroup">Require ldap-group</a></li><li><a href="mod/mod_authnz_ldap.html#reqdn">Require ldap-dn</a></li><li><a href="mod/mod_authnz_ldap.html#reqattribute">Require ldap-attribute</a></li><li><a href="mod/mod_authnz_ldap.html#reqfilter">Require ldap-filter</a></li><li><a href="mod/mod_authnz_ldap.html#reqsearch">Require ldap-search</a></li><li><a href="mod/mod_authz_dbd.html#reqgroup">Require dbd-group</a></li><li><a href="mod/mod_authz_dbm.html#reqgroup">Require dbm-group</a></li><li><a href="mod/mo
d_authz_groupfile.html#reqgroup">Require group</a></li><li><a href="mod/mod_authz_host.html#reqhost">Require host</a></li><li><code class="directive"><a href="./mod/mod_ssl.html#sslrequire">SSLRequire</a></code></li><li><code class="directive"><a href="./mod/mod_log_debug.html#logmessage">LogMessage</a></code></li><li><code class="module"><a href="./mod/mod_include.html">mod_include</a></code></li></ul><ul class="seealso"><li><a href="#comments_section">Comments</a></li></ul></div>
<div class="top"><a href="#page-header"><img alt="top" src="./images/up.gif" /></a></div>
<div class="section">
<h2><a name="grammar" id="grammar">Grammar in Backus-Naur Form notation</a></h2>
@@ -470,6 +470,9 @@ listfunction ::= listfuncname "<strong>(
<tr><td><code>filesize</code></td>
<td>Return size of a file (or 0 if file does not exist or is not
regular file)</td><td>yes</td></tr>
+<tr class="odd"><td><code>ldap</code></td>
+ <td>Escape characters as required by LDAP distinguished name escaping
+ (RFC4514) and LDAP filter escaping (RFC4515).</td><td /></tr>
</table>
<p>The functions marked as "restricted" are not available in some modules
Modified: httpd/httpd/trunk/docs/manual/howto/public_html.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.xml.ja?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.xml.ja [utf-8] Sat May 3 12:33:28 2014
@@ -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: 659902:1330277 (outdated) -->
+<!-- English Revision: 659902:1591191 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/howto/public_html.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.xml.ko?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.xml.ko [euc-kr] Sat May 3 12:33:28 2014
@@ -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:1330277 (outdated) -->
+<!-- English Revision: 151408:1591191 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/howto/public_html.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/howto/public_html.xml.tr?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/howto/public_html.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/howto/public_html.xml.tr [utf-8] Sat May 3 12:33:28 2014
@@ -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: 1174747:1330277 (outdated) -->
+<!-- English Revision: 1174747:1591191 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.de?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.de Sat May 3 12:33:28 2014
@@ -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:1585829 (outdated) -->
+<!-- English Revision: 344972:1590310 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.es
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.es?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.es (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.es Sat May 3 12:33:28 2014
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd">
<?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
-<!-- English Revision: 1040494:1585829 (outdated) -->
+<!-- English Revision: 1040494:1590310 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.ja?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.ja [utf-8] Sat May 3 12:33:28 2014
@@ -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:1585829 (outdated) -->
+<!-- English Revision: 669847:1590310 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/core.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/core.xml.tr?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/core.xml.tr [utf-8] Sat May 3 12:33:28 2014
@@ -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: 1302855:1585829 (outdated) -->
+<!-- English Revision: 1302855:1590310 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authnz_ldap.html.en Sat May 3 12:33:28 2014
@@ -126,6 +126,7 @@ for HTTP Basic authentication.</td></tr>
<li><a href="#reqdn">Require ldap-dn</a></li>
<li><a href="#reqattribute">Require ldap-attribute</a></li>
<li><a href="#reqfilter">Require ldap-filter</a></li>
+ <li><a href="#reqsearch">Require ldap-search</a></li>
</ul>
</li>
@@ -257,6 +258,11 @@ for HTTP Basic authentication.</td></tr>
directive, and the search filter successfully finds a single user
object that matches the dn of the authenticated user.</li>
+ <li>Grant access if there is a <a href="#reqsearch">
+ <code>Require ldap-search</code></a>
+ directive, and the search filter successfully returns a single
+ matching object with any distinguished name.</li>
+
<li>otherwise, deny or decline access</li>
</ul>
@@ -516,6 +522,36 @@ AuthLDAPMaxSubGroupDepth 1</pre>
<code>ldap-attribute</code> will be faster than the search operation
used by <code>ldap-filter</code> especially within a large directory.</p>
+ <p>When using an <a href="../expr.html">expression</a> within the filter, care
+ must be taken to ensure that LDAP filters are escaped correctly to guard against
+ LDAP injection. The ldap function can be used for this purpose.</p>
+
+<pre class="prettyprint lang-config"><LocationMatch ^/dav/(?<SITENAME>[^/]+)/>
+ Require ldap-filter (memberOf=cn=%{ldap:%{unescape:%{env:MATCH_SITENAME}},ou=Websites,o=Example)
+</LocationMatch></pre>
+
+
+
+
+<h3><a name="reqsearch" id="reqsearch">Require ldap-search</a></h3>
+
+ <p>The <code>Require ldap-search</code> directive allows the
+ administrator to grant access based on a generic LDAP search filter using an
+ <a href="../expr.html">expression</a>. If there is exactly one match to the search filter,
+ regardless of the distinguished name, access is granted.</p>
+
+ <p>The following directive would grant access to URLs that match the given objects in the
+ LDAP server:</p>
+
+<pre class="prettyprint lang-config"><LocationMatch ^/dav/(?<SITENAME>[^/]+)/>
+Require ldap-search (cn=%{ldap:%{unescape:%{env:MATCH_SITENAME}} Website)
+</LocationMatch></pre>
+
+
+ <p>Note: care must be taken to ensure that any expressions are properly escaped to guard
+ against LDAP injection. The <strong>ldap</strong> function can be used as per the example
+ above.</p>
+
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_dbm.xml.meta Sat May 3 12:33:28 2014
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
<variant outdated="yes">ko</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_groupfile.xml.meta Sat May 3 12:33:28 2014
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_authz_host.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_authz_host.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_authz_host.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_authz_host.xml.meta Sat May 3 12:33:28 2014
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ja [utf-8] Sat May 3 12:33:28 2014
@@ -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: 504183:1561569 (outdated) -->
+<!-- English Revision: 504183:1590566 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.ko [euc-kr] Sat May 3 12:33:28 2014
@@ -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: 105569:1561569 (outdated) -->
+<!-- English Revision: 105569:1590566 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_cache.xml.meta Sat May 3 12:33:28 2014
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
<variant outdated="yes">ja</variant>
<variant outdated="yes">ko</variant>
</variants>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml.meta Sat May 3 12:33:28 2014
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_proxy.xml.meta Sat May 3 12:33:28 2014
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
<variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.meta?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.meta (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_rewrite.xml.meta Sat May 3 12:33:28 2014
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant outdated="yes">fr</variant>
+ <variant>fr</variant>
</variants>
</metafile>
Modified: httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.html.en?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ssl_ct.html.en Sat May 3 12:33:28 2014
@@ -41,7 +41,23 @@ open source project. The goal of Certif
use of server certificates which are trusted by browsers but were mistakenly
or maliciously issued. More information about Certificate Transparency is
available at <a href="http://www.certificate-transparency.org/">
-http://www.certificate-transparency.org/</a>.</p>
+http://www.certificate-transparency.org/</a>. Key terminology used in
+this documentation:</p>
+
+<dl>
+ <dt>Certificate log</dt>
+ <dd>A certificate log, referred to simply as <q>log</q> in this documentation,
+ is a network service to which server certificates have been submitted. A
+ user agent can confirm that the certificate of a server which it accesses
+ has been submitted to a log which it trusts, and that the log itself has
+ not been tampered with.</dd>
+
+ <dt>Signed Certificate Timestamp (SCT)</dt>
+ <dd>This is an acknowledgement from a log that it has accepted a valid
+ certificate. It is signed with the log's public key. One or more SCTs
+ is passed to clients during the handshake, either in the ServerHello
+ (TLS extension), certificate extension, or in a stapled OCSP response.</dd>
+</dl>
<p>This implementation for Apache httpd provides these features for TLS
servers and proxies:</p>
@@ -212,7 +228,7 @@ testing.</p>
</dl>
<p>Generally, only a small subset of this information is configured for a
- particular log. Refer to the documentation for the <code class="directive"><a href="#ctstaticlogconfig">CTStaticLogConfig</a></code> and the
+ particular log. Refer to the documentation for the <code class="directive"><a href="#ctstaticlogconfig">CTStaticLogConfig</a></code> directive and the
<code class="program"><a href="../programs/ctlogconfig.html">ctlogconfig</a></code> command for more specific information.</p>
</div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
@@ -303,6 +319,10 @@ testing.</p>
<p>An alternative implementation could be used to retrieve SCTs for a
server certificate as long as the command-line interface is equivalent.</p>
+ <p>If this directive is not configured, server certificates cannot be
+ submitted to logs in order to obtain SCTs; thus, only admin-managed
+ SCTs will be provided to clients.</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="CTLogConfigDB" id="CTLogConfigDB">CTLogConfigDB</a> <a name="ctlogconfigdb" id="ctlogconfigdb">Directive</a></h2>
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.de Sat May 3 12:33:28 2014
@@ -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: 151408:1448588 (outdated) -->
+<!-- English Revision: 151408:1590656 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.ja [utf-8] Sat May 3 12:33:28 2014
@@ -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: 674934:1448588 (outdated) -->
+<!-- English Revision: 674934:1590656 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.tr?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/mod/mpm_common.xml.tr [utf-8] Sat May 3 12:33:28 2014
@@ -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: 1308409:1448588 (outdated) -->
+<!-- English Revision: 1308409:1590656 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
Modified: httpd/httpd/trunk/docs/manual/mod/quickreference.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/quickreference.html.en?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/quickreference.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/quickreference.html.en Sat May 3 12:33:28 2014
@@ -485,7 +485,7 @@ found</td></tr>
media type in the HTTP Content-Type header field</td></tr>
<tr><td><a href="mod_log_forensic.html#forensiclog">ForensicLog <var>filename</var>|<var>pipe</var></a></td><td></td><td>sv</td><td>E</td></tr><tr><td class="descr" colspan="4">Sets filename of the forensic log</td></tr>
<tr class="odd"><td><a href="core.html#gprofdir" id="G" name="G">GprofDir <var>/tmp/gprof/</var>|<var>/tmp/gprof/</var>%</a></td><td></td><td>sv</td><td>C</td></tr><tr class="odd"><td class="descr" colspan="4">Directory to write gmon.out profiling data to. </td></tr>
-<tr><td><a href="mpm_common.html#gracefulshutdowntimeout">GracefulShutDownTimeout <var>seconds</var></a></td><td></td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Specify a timeout after which a gracefully shutdown server
+<tr><td><a href="mpm_common.html#gracefulshutdowntimeout">GracefulShutdownTimeout <var>seconds</var></a></td><td> 0 </td><td>s</td><td>M</td></tr><tr><td class="descr" colspan="4">Specify a timeout after which a gracefully shutdown server
will exit.</td></tr>
<tr class="odd"><td><a href="mod_unixd.html#group">Group <var>unix-group</var></a></td><td> #-1 </td><td>s</td><td>B</td></tr><tr class="odd"><td class="descr" colspan="4">Group under which the server will answer
requests</td></tr>
Modified: httpd/httpd/trunk/docs/manual/sections.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml.ja?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml.ja [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml.ja [utf-8] Sat May 3 12:33:28 2014
@@ -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:1554301 (outdated) -->
+<!-- English Revision: 420990:1590674 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/sections.xml.ko
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml.ko?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml.ko [euc-kr] (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml.ko [euc-kr] Sat May 3 12:33:28 2014
@@ -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:1554301 (outdated) -->
+<!-- English Revision: 105989:1590674 (outdated) -->
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
Modified: httpd/httpd/trunk/docs/manual/sections.xml.tr
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/sections.xml.tr?rev=1592193&r1=1592192&r2=1592193&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/sections.xml.tr [utf-8] (original)
+++ httpd/httpd/trunk/docs/manual/sections.xml.tr [utf-8] Sat May 3 12:33:28 2014
@@ -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:1554301 (outdated) -->
+<!-- English Revision: 1300910:1590674 (outdated) -->
<!-- =====================================================
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>