diff options
23 files changed, 171 insertions, 163 deletions
diff --git a/docs/manual/mod/core.html.en b/docs/manual/mod/core.html.en index ca45702e30..7d8d4dfd99 100644 --- a/docs/manual/mod/core.html.en +++ b/docs/manual/mod/core.html.en @@ -416,10 +416,10 @@ such as via different symbolic links.</p> Directory, Location and Files sections work</a> for an explanation of how these different sections are combined when a request is received</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="DirectoryMatch" id="DirectoryMatch"><DirectoryMatch></a> <a name="directorymatch" id="directorymatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td>Enclose a group of directives that apply only to -file-system directories that match a regular expression and their + </a></th><td>Enclose directives that apply to +file-system directories matching a regular expression and their subdirectories</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: - </a></th><td><Directory <em>regex</em>> + </a></th><td><DirectoryMatch <em>regex</em>> ... </Directory></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config, virtual host</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: diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 8327ef0ff4..ee4f357327 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -517,10 +517,10 @@ such as via different symbolic links.</p> <directivesynopsis type="section"> <name>DirectoryMatch</name> -<description>Enclose a group of directives that apply only to -file-system directories that match a regular expression and their +<description>Enclose directives that apply to +file-system directories matching a regular expression and their subdirectories</description> -<syntax><Directory <em>regex</em>> +<syntax><DirectoryMatch <em>regex</em>> ... </Directory></syntax> <contextlist><context>server config</context><context>virtual host</context> </contextlist> diff --git a/docs/manual/mod/mod_alias.html.en b/docs/manual/mod/mod_alias.html.en index fa3f1c4eef..66f5bab2a2 100644 --- a/docs/manual/mod/mod_alias.html.en +++ b/docs/manual/mod/mod_alias.html.en @@ -149,9 +149,8 @@ sections.</p></div> </code></p></div> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="RedirectMatch" id="RedirectMatch">RedirectMatch</a> <a name="redirectmatch" id="redirectmatch">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td>Sends an external redirect asking the client to fetch -a different URL based on a regular expression match of the -current URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Sends an external redirect based on a regular expression match +of the current URL</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>RedirectMatch [<em>status</em>] <em>regex URL</em></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>FileInfo</td></tr><tr><th><a href="directive-dict.html#Status">Status: diff --git a/docs/manual/mod/mod_alias.xml b/docs/manual/mod/mod_alias.xml index 7149430722..6ed576e621 100644 --- a/docs/manual/mod/mod_alias.xml +++ b/docs/manual/mod/mod_alias.xml @@ -176,9 +176,8 @@ sections.</p></note> <directivesynopsis> <name>RedirectMatch</name> -<description>Sends an external redirect asking the client to fetch -a different URL based on a regular expression match of the -current URL</description> +<description>Sends an external redirect based on a regular expression match +of the current URL</description> <syntax>RedirectMatch [<em>status</em>] <em>regex URL</em></syntax> <contextlist><context>server config</context><context>virtual host</context> <context>directory</context><context>.htaccess</context></contextlist> diff --git a/docs/manual/mod/mod_auth_digest.html.en b/docs/manual/mod/mod_auth_digest.html.en index 5d71c2e034..6b8dd55da2 100644 --- a/docs/manual/mod/mod_auth_digest.html.en +++ b/docs/manual/mod/mod_auth_digest.html.en @@ -141,8 +141,7 @@ server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </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="AuthDigestNonceFormat" id="AuthDigestNonceFormat">AuthDigestNonceFormat</a> <a name="authdigestnonceformat" id="authdigestnonceformat">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: </a></th><td>Determines how the nonce is generated</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: - </a></th><td>???</td></tr><tr><th><a href="directive-dict.html#Default">Default: - </a></th><td><code>???</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: + </a></th><td>AuthDigestNonceFormat <em>format</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: diff --git a/docs/manual/mod/mod_auth_digest.xml b/docs/manual/mod/mod_auth_digest.xml index 5d9b919dcd..ec2b63d993 100644 --- a/docs/manual/mod/mod_auth_digest.xml +++ b/docs/manual/mod/mod_auth_digest.xml @@ -172,8 +172,7 @@ authentication</description> <directivesynopsis> <name>AuthDigestNonceFormat</name> <description>Determines how the nonce is generated</description> -<syntax>???</syntax> -<default>???</default> +<syntax>AuthDigestNonceFormat <em>format</em></syntax> <contextlist><context>directory</context><context>.htaccess</context> </contextlist> <override>AuthConfig</override> diff --git a/docs/manual/mod/mod_auth_ldap.html.en b/docs/manual/mod/mod_auth_ldap.html.en index ed0c6e18f7..cc4c8cc1a8 100644 --- a/docs/manual/mod/mod_auth_ldap.html.en +++ b/docs/manual/mod/mod_auth_ldap.html.en @@ -7,7 +7,7 @@ --><title>mod_auth_ldap - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_auth_ldap</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description: </a></th><td>Allows an LDAP directory to be used to store the database for HTTP Basic authentication.</td></tr><tr><th><a href="module-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier: + </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier: </a></th><td>auth_ldap_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File: </a></th><td>mod_auth_ldap.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility: </a></th><td>Available in version 2.0.41 and later</td></tr></table><h3>Summary</h3> @@ -493,12 +493,13 @@ AuthLDAPFrontPageHack on </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="AuthLDAPAuthoritative" id="AuthLDAPAuthoritative">AuthLDAPAuthoritative</a> <a name="authldapauthoritative" id="authldapauthoritative">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Prevent other authentication modules from +authenticating the user if this one fails</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPAuthoritative on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPAuthoritative on</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>Set to <code>off</code> if this module should let other authentication modules attempt to authenticate the user, should @@ -506,33 +507,33 @@ AuthLDAPFrontPageHack on to lower modules if there is no DN or rule that matches the supplied user name (as passed by the client).</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="AuthLDAPBindDN" id="AuthLDAPBindDN">AuthLDAPBindDN</a> <a name="authldapbinddn" id="authldapbinddn">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Optional DN to use in binding to the LDAP server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPBindDN <em>distinguished-name</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>An optional DN used to bind to the server when searching for entries. If not provided, <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> will use an anonymous bind.</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="AuthLDAPBindPassword" id="AuthLDAPBindPassword">AuthLDAPBindPassword</a> <a name="authldapbindpassword" id="authldapbindpassword">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Password used in conjuction with the bind DN</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPBindPassword <em>password</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>A bind password to use in conjunction with the bind DN. Note that the bind password is probably sensitive data, and should be properly protected. You should only use the <code class="directive"><a href="#authldapbinddn">AuthLDAPBindDN</a></code> and <code class="directive"><a href="#authldapbindpassword">AuthLDAPBindPassword</a></code> if you absolutely need them to search the directory.</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="AuthLDAPCompareDNOnServer" id="AuthLDAPCompareDNOnServer">AuthLDAPCompareDNOnServer</a> <a name="authldapcomparednonserver" id="authldapcomparednonserver">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Use the LDAP server to compare the DNs</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPCompareDNOnServer on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPCompareDNOnServer on</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>When set, <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> will use the LDAP server to compare the DNs. This is the only foolproof way to @@ -545,23 +546,23 @@ AuthLDAPFrontPageHack on much faster. Note the <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> cache can speed up DN comparison in most situations.</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="AuthLDAPDereferenceAliases" id="AuthLDAPDereferenceAliases">AuthLDAPDereferenceAliases</a> <a name="authldapdereferencealiases" id="authldapdereferencealiases">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>When will the module de-reference aliases</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPDereferenceAliases never|searching|finding|always</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPDereferenceAliases Always</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>This directive specifies when <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> will de-reference aliases during LDAP operations. The default is <code>always</code>.</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="AuthLDAPEnabled" id="AuthLDAPEnabled">AuthLDAPEnabled</a> <a name="authldapenabled" id="authldapenabled">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Turn on or off LDAP authentication</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td> AuthLDAPEnabled on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPEnabled on</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>Set to <code>off</code> to disable <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> in certain directories. This is @@ -569,21 +570,21 @@ AuthLDAPFrontPageHack on near the top of your tree, but want to disable it completely in certain locations.</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="AuthLDAPFrontPageHack" id="AuthLDAPFrontPageHack">AuthLDAPFrontPageHack</a> <a name="authldapfrontpagehack" id="authldapfrontpagehack">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Allow LDAP authentication to work with MS FrontPage</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPFrontPageHack on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPFronPageHack off</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>See the section on <a href="#frontpage">using Microsoft FrontPage</a> with <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code>.</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="AuthLDAPGroupAttribute" id="AuthLDAPGroupAttribute">AuthLDAPGroupAttribute</a> <a name="authldapgroupattribute" id="authldapgroupattribute">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>LDAP attributes used to check for group membership</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPGroupAttribute <em>attribute</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>This directive specifies which LDAP attributes are used to check for group membership. Multiple attributes can be used by @@ -591,12 +592,13 @@ AuthLDAPFrontPageHack on then <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> uses the <code>member</code> and <code>uniquemember</code> attributes.</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="AuthLDAPGroupAttributeIsDN" id="AuthLDAPGroupAttributeIsDN">AuthLDAPGroupAttributeIsDN</a> <a name="authldapgroupattributeisdn" id="authldapgroupattributeisdn">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Use the DN of the client username when checking for +group membership</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPGroupAttributeIsDN on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPGroupAttributeIsDN on</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>When set <code>on</code>, this directive says to use the distinguished name of the client username when checking for group @@ -609,12 +611,13 @@ AuthLDAPFrontPageHack on directive is not set, then <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> will check if the group has <code>bjenson</code> as a member.</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="AuthLDAPRemoteUserIsDN" id="AuthLDAPRemoteUserIsDN">AuthLDAPRemoteUserIsDN</a> <a name="authldapremoteuserisdn" id="authldapremoteuserisdn">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Use the DN of the client username to set the REMOTE_USER +environment variable</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPRemoteUserIsDN on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPUserIsDN off</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>If this directive is set to on, the value of the <code>REMOTE_USER</code> environment variable will be set to the full @@ -622,23 +625,23 @@ AuthLDAPFrontPageHack on the username that was passed by the client. It is turned off by default.</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="AuthLDAPStartTLS directive" id="AuthLDAPStartTLS directive">AuthLDAPStartTLS directive</a> <a name="authldapstarttls directive" id="authldapstarttls directive">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Use a secure TLS connection to the LDAP server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPStartTLS on|off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>AuthLDAPStartTLS off</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>If this directive is set to <code>on</code>, <code class="module"><a href="../mod/mod_auth_ldap.html">mod_auth_ldap</a></code> will start a secure TLS session after connecting to the LDAP server. This requires your LDAP server to support TLS.</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="AuthLDAPUrl" id="AuthLDAPUrl">AuthLDAPUrl</a> <a name="authldapurl" id="authldapurl">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>URL specifying the LDAP search parameters</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AuthLDAPUrl <em>url</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>directory, .htaccess</td></tr><tr><th><a href="directive-dict.html#Override">Override: </a></th><td>AuthConfig</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_auth_ldap</td></tr></table> <p>An RFC 2255 URL which specifies the LDAP search parameters to use. The syntax of the URL is</p> diff --git a/docs/manual/mod/mod_auth_ldap.xml b/docs/manual/mod/mod_auth_ldap.xml index 997b7a3332..1599974f88 100644 --- a/docs/manual/mod/mod_auth_ldap.xml +++ b/docs/manual/mod/mod_auth_ldap.xml @@ -6,7 +6,7 @@ <name>mod_auth_ldap</name> <description>Allows an LDAP directory to be used to store the database for HTTP Basic authentication.</description> -<status>experimental</status> +<status>Experimental</status> <sourcefile>mod_auth_ldap.c</sourcefile> <identifier>auth_ldap_module</identifier> <compatibility>Available in version 2.0.41 and later</compatibility> @@ -537,6 +537,8 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPAuthoritative</name> +<description>Prevent other authentication modules from +authenticating the user if this one fails</description> <syntax>AuthLDAPAuthoritative on|off</syntax> <default>AuthLDAPAuthoritative on</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -554,6 +556,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPBindDN</name> +<description>Optional DN to use in binding to the LDAP server</description> <syntax>AuthLDAPBindDN <em>distinguished-name</em></syntax> <contextlist><context>directory</context><context>.htaccess</context> </contextlist> @@ -568,6 +571,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPBindPassword</name> +<description>Password used in conjuction with the bind DN</description> <syntax>AuthLDAPBindPassword <em>password</em></syntax> <contextlist><context>directory</context><context>.htaccess</context> </contextlist> @@ -585,6 +589,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPCompareDNOnServer</name> +<description>Use the LDAP server to compare the DNs</description> <syntax>AuthLDAPCompareDNOnServer on|off</syntax> <default>AuthLDAPCompareDNOnServer on</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -608,6 +613,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPDereferenceAliases</name> +<description>When will the module de-reference aliases</description> <syntax>AuthLDAPDereferenceAliases never|searching|finding|always</syntax> <default>AuthLDAPDereferenceAliases Always</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -623,6 +629,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPEnabled</name> +<description>Turn on or off LDAP authentication</description> <syntax> AuthLDAPEnabled on|off</syntax> <default>AuthLDAPEnabled on</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -640,6 +647,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPFrontPageHack</name> +<description>Allow LDAP authentication to work with MS FrontPage</description> <syntax>AuthLDAPFrontPageHack on|off</syntax> <default>AuthLDAPFronPageHack off</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -654,6 +662,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPGroupAttribute</name> +<description>LDAP attributes used to check for group membership</description> <syntax>AuthLDAPGroupAttribute <em>attribute</em></syntax> <contextlist><context>directory</context><context>.htaccess</context> </contextlist> @@ -670,6 +679,8 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPGroupAttributeIsDN</name> +<description>Use the DN of the client username when checking for +group membership</description> <syntax>AuthLDAPGroupAttributeIsDN on|off</syntax> <default>AuthLDAPGroupAttributeIsDN on</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -692,6 +703,8 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPRemoteUserIsDN</name> +<description>Use the DN of the client username to set the REMOTE_USER +environment variable</description> <syntax>AuthLDAPRemoteUserIsDN on|off</syntax> <default>AuthLDAPUserIsDN off</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -709,6 +722,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPStartTLS directive</name> +<description>Use a secure TLS connection to the LDAP server</description> <syntax>AuthLDAPStartTLS on|off</syntax> <default>AuthLDAPStartTLS off</default> <contextlist><context>directory</context><context>.htaccess</context> @@ -725,6 +739,7 @@ AuthLDAPFrontPageHack on <directivesynopsis> <name>AuthLDAPUrl</name> +<description>URL specifying the LDAP search parameters</description> <syntax>AuthLDAPUrl <em>url</em></syntax> <contextlist><context>directory</context><context>.htaccess</context> </contextlist> diff --git a/docs/manual/mod/mod_include.html.en b/docs/manual/mod/mod_include.html.en index 9c5dc4abdb..c52c8b57af 100644 --- a/docs/manual/mod/mod_include.html.en +++ b/docs/manual/mod/mod_include.html.en @@ -568,8 +568,7 @@ </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="SSIStartTag" id="SSIStartTag">SSIStartTag</a> <a name="ssistarttag" id="ssistarttag">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: </a></th><td>String that starts an include element</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: - </a></th><td>Changes the string that mod_include looks for to start an -include element</td></tr><tr><th><a href="directive-dict.html#Default">Default: + </a></th><td>SSIStartTag <em>tag</em></td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>SSIStartTag "<!--"</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config, virtual host</td></tr><tr><th><a href="directive-dict.html#Status">Status: </a></th><td>Base</td></tr><tr><th><a href="directive-dict.html#Module">Module: diff --git a/docs/manual/mod/mod_include.xml b/docs/manual/mod/mod_include.xml index 69f519dca6..b9a65c0209 100644 --- a/docs/manual/mod/mod_include.xml +++ b/docs/manual/mod/mod_include.xml @@ -635,8 +635,7 @@ an unset variable is echoed</description> <directivesynopsis> <name>SSIStartTag</name> <description>String that starts an include element</description> -<syntax>Changes the string that mod_include looks for to start an -include element</syntax> +<syntax>SSIStartTag <em>tag</em></syntax> <default>SSIStartTag "<!--"</default> <contextlist> <context>server config</context> diff --git a/docs/manual/mod/mod_info.html.en b/docs/manual/mod/mod_info.html.en index 17c2a16de8..a4c650e069 100644 --- a/docs/manual/mod/mod_info.html.en +++ b/docs/manual/mod/mod_info.html.en @@ -56,7 +56,7 @@ SetHandler server-info<br /> </div> </div><div id="quickview"><h3 class="directives">Directives</h3><ul id="toc"><li><img alt="" src="../images/down.gif" /> <a href="#addmoduleinfo">AddModuleInfo</a></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="AddModuleInfo" id="AddModuleInfo">AddModuleInfo</a> <a name="addmoduleinfo" id="addmoduleinfo">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td>Allows additional information to be added to the module + </a></th><td>Adds additional information to the module information displayed by the server-info handler</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AddModuleInfo <em>module-name string</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config, virtual diff --git a/docs/manual/mod/mod_info.xml b/docs/manual/mod/mod_info.xml index 2d3a77b132..977434150f 100644 --- a/docs/manual/mod/mod_info.xml +++ b/docs/manual/mod/mod_info.xml @@ -61,7 +61,7 @@ SetHandler server-info<br /> <directivesynopsis> <name>AddModuleInfo</name> -<description>Allows additional information to be added to the module +<description>Adds additional information to the module information displayed by the server-info handler</description> <syntax>AddModuleInfo <em>module-name string</em></syntax> <contextlist><context>server config</context> <context>virtual diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index 4e11f7589a..1ee313b9ef 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -7,7 +7,7 @@ --><title>mod_ldap - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_ldap</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description: </a></th><td>LDAP connection pooling and result caching services for use by other LDAP modules</td></tr><tr><th><a href="module-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier: + </a></th><td>Experimental</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier: </a></th><td>ldap_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File: </a></th><td>util_ldap.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility: </a></th><td>Available in version 2.0.41 and later</td></tr></table><h3>Summary</h3> @@ -144,31 +144,31 @@ authentication provided by <code class="module"><a href="../mod/mod_auth_ldap.ht instance processes the request.</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="LDAPCacheEntries" id="LDAPCacheEntries">LDAPCacheEntries</a> <a name="ldapcacheentries" id="ldapcacheentries">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Maximum number of entires in the primary LDAP cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LDAPCacheEntries <em>number</em></td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>LDAPCacheEntries 1024</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_ldap</td></tr></table> <p>Specifies the maximum size of the primary LDAP cache. This cache contains successful search/binds. Set it to 0 to turn off search/bind caching. The default size is 1024 cached searches.</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="LDAPCacheTTL" id="LDAPCacheTTL">LDAPCacheTTL</a> <a name="ldapcachettl" id="ldapcachettl">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Time that cached items remain valid</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LDAPCacheTTL <em>seconds</em></td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>LDAPCacheTTL 600</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_ldap</td></tr></table> <p>Specifies the time (in seconds) that an item in the search/bind cache remains valid. The default is 600 seconds (10 minutes).</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="LDAPCertDBPath" id="LDAPCertDBPath">LDAPCertDBPath</a> <a name="ldapcertdbpath" id="ldapcertdbpath">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Directory containing certificates for SSL support</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LDAPCertDBPath <em>directory-path</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_ldap</td></tr></table> <p>This directive is only valid if Apache has been linked against the Netscape/iPlanet Directory SDK.</p> @@ -178,30 +178,32 @@ authentication provided by <code class="module"><a href="../mod/mod_auth_ldap.ht support. There should be a file named <code>cert7.db</code> in that directory.</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="LDAPOpCacheEntries" id="LDAPOpCacheEntries">LDAPOpCacheEntries</a> <a name="ldapopcacheentries" id="ldapopcacheentries">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Number of entries used to cache LDAP compare +operations</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LDAPOpCacheEntries <em>number</em></td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>LDAPOpCacheEntries 1024</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_ldap</td></tr></table> <p>This specifies the number of entries <code class="module"><a href="../mod/mod_ldap.html">mod_ldap</a></code> will use to cache LDAP compare operations. The default is 1024 entries. Setting it to 0 disables operation caching.</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="LDAPOpCacheTTL" id="LDAPOpCacheTTL">LDAPOpCacheTTL</a> <a name="ldapopcachettl" id="ldapopcachettl">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Time that entries in the operation cache remain +valid</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LDAPOpCacheTTL <em>seconds</em></td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>LDAPOpCacheTTL 600</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_ldap</td></tr></table> <p>Specifies the time (in seconds) that entries in the operation cache remain valid. The default is 600 seconds.</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="LDAPSharedCacheSize" id="LDAPSharedCacheSize">LDAPSharedCacheSize</a> <a name="ldapsharedcachesize" id="ldapsharedcachesize">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td /></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Size in bytes of the shared-memory cache</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LDAPSharedCacheSize <em>bytes</em></td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>LDAPSharedCacheSize 102400</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Experimental</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_ldap</td></tr></table> <p>Specifies the number of bytes to specify for the shared memory cache. The default is 100kb.</p> diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index c878316bbd..94568f4fe6 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -6,7 +6,7 @@ <name>mod_ldap</name> <description>LDAP connection pooling and result caching services for use by other LDAP modules</description> -<status>experimental</status> +<status>Experimental</status> <sourcefile>util_ldap.c</sourcefile> <identifier>ldap_module</identifier> <compatibility>Available in version 2.0.41 and later</compatibility> @@ -157,6 +157,7 @@ authentication provided by <module>mod_auth_ldap</module>.</p> <directivesynopsis> <name>LDAPSharedCacheSize</name> +<description>Size in bytes of the shared-memory cache</description> <syntax>LDAPSharedCacheSize <em>bytes</em></syntax> <default>LDAPSharedCacheSize 102400</default> <contextlist><context>server config</context></contextlist> @@ -169,6 +170,7 @@ authentication provided by <module>mod_auth_ldap</module>.</p> <directivesynopsis> <name>LDAPCacheEntries</name> +<description>Maximum number of entires in the primary LDAP cache</description> <syntax>LDAPCacheEntries <em>number</em></syntax> <default>LDAPCacheEntries 1024</default> <contextlist><context>server config</context></contextlist> @@ -183,6 +185,7 @@ authentication provided by <module>mod_auth_ldap</module>.</p> <directivesynopsis> <name>LDAPCacheTTL</name> +<description>Time that cached items remain valid</description> <syntax>LDAPCacheTTL <em>seconds</em></syntax> <default>LDAPCacheTTL 600</default> <contextlist><context>server config</context></contextlist> @@ -196,6 +199,8 @@ authentication provided by <module>mod_auth_ldap</module>.</p> <directivesynopsis> <name>LDAPOpCacheEntries</name> +<description>Number of entries used to cache LDAP compare +operations</description> <syntax>LDAPOpCacheEntries <em>number</em></syntax> <default>LDAPOpCacheEntries 1024</default> <contextlist><context>server config</context></contextlist> @@ -209,6 +214,8 @@ authentication provided by <module>mod_auth_ldap</module>.</p> <directivesynopsis> <name>LDAPOpCacheTTL</name> +<description>Time that entries in the operation cache remain +valid</description> <syntax>LDAPOpCacheTTL <em>seconds</em></syntax> <default>LDAPOpCacheTTL 600</default> <contextlist><context>server config</context></contextlist> @@ -221,6 +228,7 @@ authentication provided by <module>mod_auth_ldap</module>.</p> <directivesynopsis> <name>LDAPCertDBPath</name> +<description>Directory containing certificates for SSL support</description> <syntax>LDAPCertDBPath <em>directory-path</em></syntax> <contextlist><context>server config</context></contextlist> diff --git a/docs/manual/mod/mod_mime.html.en b/docs/manual/mod/mod_mime.html.en index ceaf47edf5..aada274220 100644 --- a/docs/manual/mod/mod_mime.html.en +++ b/docs/manual/mod/mod_mime.html.en @@ -351,7 +351,7 @@ to the specified content language</td></tr><tr><th><a href="directive-dict.html# be specified with or without a leading dot.</p> <h3>See also</h3><ul><li><code class="module"><a href="../mod/mod_negotiation.html">mod_negotiation</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="AddOutputFilter" id="AddOutputFilter">AddOutputFilter</a> <a name="addoutputfilter" id="addoutputfilter">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td>maps the filename + </a></th><td>Maps filename extensions to the filters that will process responses from the server</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>AddOutputFilter diff --git a/docs/manual/mod/mod_mime.xml b/docs/manual/mod/mod_mime.xml index 4cf795d5e9..a807c4a319 100644 --- a/docs/manual/mod/mod_mime.xml +++ b/docs/manual/mod/mod_mime.xml @@ -447,7 +447,7 @@ to the specified content language</description> <directivesynopsis> <name>AddOutputFilter</name> -<description>maps the filename +<description>Maps filename extensions to the filters that will process responses from the server</description> <syntax>AddOutputFilter diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 2ae9182faf..5bdff4a4e3 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -267,15 +267,7 @@ allow connections to the listed ports only.</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="NoProxy" id="NoProxy">NoProxy</a> <a name="noproxy" id="noproxy">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: </a></th><td>Hosts, domains, or networks that will be connected to directly</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: - </a></th><td>NoProxy - <em>Domain</em>| - <em>SubNet</em>| - <em>IpAddr</em>| - <em>Hostname</em> -[<em>Domain</em>| - <em>SubNet</em>| - <em>IpAddr</em>| - <em>Hostname</em>] ...</td></tr><tr><th><a href="directive-dict.html#Context">Context: + </a></th><td>NoProxy <em>host</em> [<em>host</em>] ...</td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config, virtual host</td></tr><tr><th><a href="directive-dict.html#Status">Status: </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_proxy</td></tr></table> @@ -291,7 +283,8 @@ always served directly, without forwarding to the configured NoProxy .mycompany.com 192.168.112.0/21 </code></p></div> -<p>The arguments to the NoProxy directive are one of the following type list:</p> +<p>The <em>host</em> arguments to the NoProxy directive are one of the +following type list:</p> <dl> <dt><a name="domain"> diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 4161a70e61..da46844ebc 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -662,15 +662,7 @@ set to prevent infinite proxy loops, or a DoS attack.</p> <name>NoProxy</name> <description>Hosts, domains, or networks that will be connected to directly</description> -<syntax>NoProxy - <em>Domain</em>| - <em>SubNet</em>| - <em>IpAddr</em>| - <em>Hostname</em> -[<em>Domain</em>| - <em>SubNet</em>| - <em>IpAddr</em>| - <em>Hostname</em>] ...</syntax> +<syntax>NoProxy <em>host</em> [<em>host</em>] ...</syntax> <contextlist><context>server config</context> <context>virtual host</context> </contextlist> @@ -688,7 +680,8 @@ always served directly, without forwarding to the configured NoProxy .mycompany.com 192.168.112.0/21 </example> -<p>The arguments to the NoProxy directive are one of the following type list:</p> +<p>The <em>host</em> arguments to the NoProxy directive are one of the +following type list:</p> <dl> <!-- ===================== Domain ======================= --> <dt><a name="domain"> diff --git a/docs/manual/mod/mod_so.html.en b/docs/manual/mod/mod_so.html.en index e068695cc0..6bc87e5336 100644 --- a/docs/manual/mod/mod_so.html.en +++ b/docs/manual/mod/mod_so.html.en @@ -7,9 +7,11 @@ --><title>mod_so - Apache HTTP Server</title><link href="../style/css/manual.css" rel="stylesheet" media="all" type="text/css" title="Main stylesheet" /><link href="../style/css/manual-loose-100pc.css" rel="alternate stylesheet" media="all" type="text/css" title="No Sidebar - Default font size" /><link href="../style/css/manual-print.css" rel="stylesheet" media="print" type="text/css" /><link href="../images/favicon.ico" rel="shortcut icon" /></head><body><div id="page-header"><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p><p class="apache">Apache HTTP Server Version 2.0</p><img alt="" src="../images/feather.gif" /></div><div class="up"><a href="./"><img title="<-" alt="<-" src="../images/left.gif" /></a></div><div id="path"><a href="http://www.apache.org/">Apache</a> > <a href="http://httpd.apache.org/">HTTP Server</a> > <a href="http://httpd.apache.org/docs-project/">Documentation</a> > <a href="../">Version 2.0</a> > <a href="./">Modules</a></div><div id="page-content"><div id="preamble"><h1>Apache Module mod_so</h1><table class="module"><tr><th><a href="module-dict.html#Description">Description: </a></th><td>Loading of executable code and modules into the server at start-up or restart time</td></tr><tr><th><a href="module-dict.html#Status">Status: - </a></th><td>Base (Windows); Optional (Unix)</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier: + </a></th><td>Extension</td></tr><tr><th><a href="module-dict.html#ModuleIdentifier">Module Identifier: </a></th><td>so_module</td></tr><tr><th><a href="module-dict.html#SourceFile">Source File: - </a></th><td>mod_so.c</td></tr></table><h3>Summary</h3> + </a></th><td>mod_so.c</td></tr><tr><th><a href="module-dict.html#Compatibility">Compatibility: + </a></th><td>This is a Base module (always included) on +Windows</td></tr></table><h3>Summary</h3> <p>On selected operating systems this module can be used to load modules into Apache at runtime via the <a href="../dso.html">Dynamic Shared Object</a> (DSO) mechanism, @@ -99,7 +101,7 @@ modules into the server at start-up or restart time</td></tr><tr><th><a href="mo </a></th><td>Link in the named object file or library</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LoadFile <em>filename</em> [<em>filename</em>] ...</td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>Base (Windows); Optional (Unix)</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_so</td></tr></table> <p>The LoadFile directive links in the named object files or @@ -117,7 +119,7 @@ modules into the server at start-up or restart time</td></tr><tr><th><a href="mo of active modules</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>LoadModule <em>module filename</em></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: - </a></th><td>Base (Windows); Optional (Unix)</td></tr><tr><th><a href="directive-dict.html#Module">Module: + </a></th><td>Extension</td></tr><tr><th><a href="directive-dict.html#Module">Module: </a></th><td>mod_so</td></tr></table> <p>The LoadModule directive links in the object file or library <em>filename</em> and adds the module structure named diff --git a/docs/manual/mod/mod_so.xml b/docs/manual/mod/mod_so.xml index 1c633d9eec..6b5e173143 100755 --- a/docs/manual/mod/mod_so.xml +++ b/docs/manual/mod/mod_so.xml @@ -6,9 +6,11 @@ <name>mod_so</name> <description>Loading of executable code and modules into the server at start-up or restart time</description> -<status>Base (Windows); Optional (Unix)</status> +<status>Extension</status> <sourcefile>mod_so.c</sourcefile> <identifier>so_module</identifier> +<compatibility>This is a Base module (always included) on +Windows</compatibility> <summary> diff --git a/docs/manual/mod/mod_status.html.en b/docs/manual/mod/mod_status.html.en index 3de4e69b64..cd04efac18 100644 --- a/docs/manual/mod/mod_status.html.en +++ b/docs/manual/mod/mod_status.html.en @@ -105,9 +105,8 @@ performance</td></tr><tr><th><a href="module-dict.html#Status">Status: </div> </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div><div class="directive-section"><h2><a name="ExtendedStatus" id="ExtendedStatus">ExtendedStatus</a> <a name="extendedstatus" id="extendedstatus">Directive</a></h2><table class="directive"><tr><th><a href="directive-dict.html#Description">Description: - </a></th><td>This directive controls whether the server keeps track of -extended status information for each request. This is only -useful if the status module is enabled on the server.</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: + </a></th><td>Keep track of extended status information for each +request</td></tr><tr><th><a href="directive-dict.html#Syntax">Syntax: </a></th><td>ExtendedStatus On|Off</td></tr><tr><th><a href="directive-dict.html#Default">Default: </a></th><td><code>ExtendedStatus Off</code></td></tr><tr><th><a href="directive-dict.html#Context">Context: </a></th><td>server config</td></tr><tr><th><a href="directive-dict.html#Status">Status: @@ -116,5 +115,7 @@ useful if the status module is enabled on the server.</td></tr><tr><th><a href=" </a></th><td>ExtendedStatus is only available in Apache 1.3.2 and later.</td></tr></table> <p>This setting applies to the entire server, and cannot be - enabled or disabled on a virtualhost-by-virtualhost basis.</p> + enabled or disabled on a virtualhost-by-virtualhost basis. + The collection of extended status information can slow down + the server.</p> </div></div><div id="footer"><p class="apache">Maintained by the <a href="http://httpd.apache.org/docs-project/">Apache HTTP Server Documentation Project</a></p><p class="menu"><a href="../mod/">Modules</a> | <a href="../mod/directives.html">Directives</a> | <a href="../faq/">FAQ</a> | <a href="../glossary.html">Glossary</a> | <a href="../sitemap.html">Sitemap</a></p></div></body></html>
\ No newline at end of file diff --git a/docs/manual/mod/mod_status.xml b/docs/manual/mod/mod_status.xml index 234861b503..3930eeaa0e 100644 --- a/docs/manual/mod/mod_status.xml +++ b/docs/manual/mod/mod_status.xml @@ -118,9 +118,8 @@ performance</description> <directivesynopsis> <name>ExtendedStatus</name> -<description>This directive controls whether the server keeps track of -extended status information for each request. This is only -useful if the status module is enabled on the server.</description> +<description>Keep track of extended status information for each +request</description> <syntax>ExtendedStatus On|Off</syntax> <default>ExtendedStatus Off</default> <contextlist><context>server config</context></contextlist> @@ -129,7 +128,9 @@ later.</compatibility> <usage> <p>This setting applies to the entire server, and cannot be - enabled or disabled on a virtualhost-by-virtualhost basis.</p> + enabled or disabled on a virtualhost-by-virtualhost basis. + The collection of extended status information can slow down + the server.</p> </usage> </directivesynopsis> diff --git a/docs/manual/mod/quickreference.html.en b/docs/manual/mod/quickreference.html.en index 7c9705ece6..70dc9b8141 100644 --- a/docs/manual/mod/quickreference.html.en +++ b/docs/manual/mod/quickreference.html.en @@ -111,13 +111,13 @@ content-type</td></tr> to the specified content language</td></tr> <tr class="even"><td><a href="mod_info.html#addmoduleinfo" style="text-decoration: none">AddModuleInfo <em>module-name string</em></a></td><td /><td>E</td><td>s</td></tr><tr class="even"><td colspan="4"> - Allows additional information to be added to the module + Adds additional information to the module information displayed by the server-info handler</td></tr> <tr class="odd"><td><a href="mod_mime.html#addoutputfilter" style="text-decoration: none">AddOutputFilter <em>filter</em>[<em>;filter</em>...] extension [<em>extension</em> ...]</a></td><td /><td>B</td><td>svdh</td></tr><tr class="odd"><td colspan="4"> - maps the filename + Maps filename extensions to the filters that will process responses from the server</td></tr> <tr class="even"><td><a href="mod_mime.html#addtype" style="text-decoration: none">AddType <em>MIME-type @@ -214,7 +214,7 @@ for digest authentication</td></tr> Enables or disables checking of the nonce-count sent by the server</td></tr> -<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat" style="text-decoration: none">???</a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> +<tr class="odd"><td><a href="mod_auth_digest.html#authdigestnonceformat" style="text-decoration: none">AuthDigestNonceFormat <em>format</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> Determines how the nonce is generated</td></tr> <tr class="even"><td><a href="mod_auth_digest.html#authdigestnoncelifetime" style="text-decoration: none">AuthDigestNonceLifetime <em>seconds</em></a></td><td> 300 </td><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> @@ -228,42 +228,45 @@ authentication</td></tr> Sets the name of a text file containing the list of user groups for authentication</td></tr> -<tr class="odd"><td><a href="mod_auth_ldap.html#authldapauthoritative" style="text-decoration: none">AuthLDAPAuthoritative on|off</a></td><td> on </td><td /><td>dh</td></tr><tr class="odd"><td colspan="4"> +<tr class="odd"><td><a href="mod_auth_ldap.html#authldapauthoritative" style="text-decoration: none">AuthLDAPAuthoritative on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_auth_ldap.html#authldapbinddn" style="text-decoration: none">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td /><td>dh</td></tr><tr class="even"><td colspan="4"> + Prevent other authentication modules from +authenticating the user if this one fails</td></tr> +<tr class="even"><td><a href="mod_auth_ldap.html#authldapbinddn" style="text-decoration: none">AuthLDAPBindDN <em>distinguished-name</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbindpassword" style="text-decoration: none">AuthLDAPBindPassword <em>password</em></a></td><td /><td /><td>dh</td></tr><tr class="odd"><td colspan="4"> + Optional DN to use in binding to the LDAP server</td></tr> +<tr class="odd"><td><a href="mod_auth_ldap.html#authldapbindpassword" style="text-decoration: none">AuthLDAPBindPassword <em>password</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_auth_ldap.html#authldapcomparednonserver" style="text-decoration: none">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td /><td>dh</td></tr><tr class="even"><td colspan="4"> + Password used in conjuction with the bind DN</td></tr> +<tr class="even"><td><a href="mod_auth_ldap.html#authldapcomparednonserver" style="text-decoration: none">AuthLDAPCompareDNOnServer on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_auth_ldap.html#authldapdereferencealiases" style="text-decoration: none">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td /><td>dh</td></tr><tr class="odd"><td colspan="4"> + Use the LDAP server to compare the DNs</td></tr> +<tr class="odd"><td><a href="mod_auth_ldap.html#authldapdereferencealiases" style="text-decoration: none">AuthLDAPDereferenceAliases never|searching|finding|always</a></td><td> Always </td><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_auth_ldap.html#authldapenabled" style="text-decoration: none"> AuthLDAPEnabled on|off</a></td><td> on </td><td /><td>dh</td></tr><tr class="even"><td colspan="4"> + When will the module de-reference aliases</td></tr> +<tr class="even"><td><a href="mod_auth_ldap.html#authldapenabled" style="text-decoration: none"> AuthLDAPEnabled on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_auth_ldap.html#authldapfrontpagehack" style="text-decoration: none">AuthLDAPFrontPageHack on|off</a></td><td /><td /><td>dh</td></tr><tr class="odd"><td colspan="4"> + Turn on or off LDAP authentication</td></tr> +<tr class="odd"><td><a href="mod_auth_ldap.html#authldapfrontpagehack" style="text-decoration: none">AuthLDAPFrontPageHack on|off</a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_auth_ldap.html#authldapgroupattribute" style="text-decoration: none">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td /><td>dh</td></tr><tr class="even"><td colspan="4"> + Allow LDAP authentication to work with MS FrontPage</td></tr> +<tr class="even"><td><a href="mod_auth_ldap.html#authldapgroupattribute" style="text-decoration: none">AuthLDAPGroupAttribute <em>attribute</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn" style="text-decoration: none">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td /><td>dh</td></tr><tr class="odd"><td colspan="4"> + LDAP attributes used to check for group membership</td></tr> +<tr class="odd"><td><a href="mod_auth_ldap.html#authldapgroupattributeisdn" style="text-decoration: none">AuthLDAPGroupAttributeIsDN on|off</a></td><td> on </td><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_auth_ldap.html#authldapremoteuserisdn" style="text-decoration: none">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td /><td>dh</td></tr><tr class="even"><td colspan="4"> + Use the DN of the client username when checking for +group membership</td></tr> +<tr class="even"><td><a href="mod_auth_ldap.html#authldapremoteuserisdn" style="text-decoration: none">AuthLDAPRemoteUserIsDN on|off</a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_auth_ldap.html#authldapstarttls directive" style="text-decoration: none">AuthLDAPStartTLS on|off</a></td><td /><td /><td>dh</td></tr><tr class="odd"><td colspan="4"> + Use the DN of the client username to set the REMOTE_USER +environment variable</td></tr> +<tr class="odd"><td><a href="mod_auth_ldap.html#authldapstarttls directive" style="text-decoration: none">AuthLDAPStartTLS on|off</a></td><td /><td>X</td><td>dh</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_auth_ldap.html#authldapurl" style="text-decoration: none">AuthLDAPUrl <em>url</em></a></td><td /><td /><td>dh</td></tr><tr class="even"><td colspan="4"> + Use a secure TLS connection to the LDAP server</td></tr> +<tr class="even"><td><a href="mod_auth_ldap.html#authldapurl" style="text-decoration: none">AuthLDAPUrl <em>url</em></a></td><td /><td>X</td><td>dh</td></tr><tr class="even"><td colspan="4"> - </td></tr> + URL specifying the LDAP search parameters</td></tr> <tr class="odd"><td><a href="core.html#authname" style="text-decoration: none">AuthName <em>auth-domain</em></a></td><td /><td>C</td><td>dh</td></tr><tr class="odd"><td colspan="4"> Authorization realm for use in HTTP @@ -316,7 +319,7 @@ respect to case</td></tr> <tr class="odd"><td><a href="mod_cache.html#cachemaxstreamingbuffer" style="text-decoration: none">CacheMaxStreamingBuffer <em>size_in_bytes</em></a></td><td> 0 </td><td>X</td><td>s</td></tr><tr class="odd"><td colspan="4"> Maximum amount of a streamed response to buffer in memory before declaring the response uncacheable</td></tr> -<tr class="even"><td><a href="mod_negotiation.html#cachenegotiateddocs" style="text-decoration: none">CacheNegotiatedDocs on|off</a></td><td> off </td><td>B</td><td>s</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_negotiation.html#cachenegotiateddocs" style="text-decoration: none">CacheNegotiatedDocs on|off</a></td><td> off </td><td>B</td><td>sv</td></tr><tr class="even"><td colspan="4"> Allows content-negotiated documents to be cached by proxy servers</td></tr> @@ -430,11 +433,11 @@ named file-system directory and sub-directories</td></tr> List of resources to look for when the client requests a directory</td></tr> -<tr class="even"><td><a href="core.html#directorymatch" style="text-decoration: none"><Directory <em>regex</em>> +<tr class="even"><td><a href="core.html#directorymatch" style="text-decoration: none"><DirectoryMatch <em>regex</em>> ... </Directory></a></td><td /><td>C</td><td>sv</td></tr><tr class="even"><td colspan="4"> - Enclose a group of directives that apply only to -file-system directories that match a regular expression and their + Enclose directives that apply to +file-system directories matching a regular expression and their subdirectories</td></tr> <tr class="odd"><td><a href="core.html#documentroot" style="text-decoration: none">DocumentRoot <em>directory-path</em></a></td><td> /usr/local/apache/h + @@ -471,9 +474,8 @@ by MIME type</td></tr> Default algorithm for calculating expiration time</td></tr> <tr class="odd"><td><a href="mod_status.html#extendedstatus" style="text-decoration: none">ExtendedStatus On|Off</a></td><td> Off </td><td>B</td><td>s</td></tr><tr class="odd"><td colspan="4"> - This directive controls whether the server keeps track of -extended status information for each request. This is only -useful if the status module is enabled on the server.</td></tr> + Keep track of extended status information for each +request</td></tr> <tr class="even"><td><a href="mod_ext_filter.html#extfilterdefine" style="text-decoration: none">ExtFilterDefine <em>filtername</em> <em>parameters</em></a></td><td /><td>X</td><td>s</td></tr><tr class="even"><td colspan="4"> </td></tr> @@ -593,24 +595,26 @@ requests on a persistent connection</td></tr> The precendence of language variants for cases where the client does not express a preference</td></tr> -<tr class="even"><td><a href="mod_ldap.html#ldapcacheentries" style="text-decoration: none">LDAPCacheEntries <em>number</em></a></td><td> 1024 </td><td /><td>s</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_ldap.html#ldapcacheentries" style="text-decoration: none">LDAPCacheEntries <em>number</em></a></td><td> 1024 </td><td>X</td><td>s</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_ldap.html#ldapcachettl" style="text-decoration: none">LDAPCacheTTL <em>seconds</em></a></td><td> 600 </td><td /><td>s</td></tr><tr class="odd"><td colspan="4"> + Maximum number of entires in the primary LDAP cache</td></tr> +<tr class="odd"><td><a href="mod_ldap.html#ldapcachettl" style="text-decoration: none">LDAPCacheTTL <em>seconds</em></a></td><td> 600 </td><td>X</td><td>s</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_ldap.html#ldapcertdbpath" style="text-decoration: none">LDAPCertDBPath <em>directory-path</em></a></td><td /><td /><td>s</td></tr><tr class="even"><td colspan="4"> + Time that cached items remain valid</td></tr> +<tr class="even"><td><a href="mod_ldap.html#ldapcertdbpath" style="text-decoration: none">LDAPCertDBPath <em>directory-path</em></a></td><td /><td>X</td><td>s</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_ldap.html#ldapopcacheentries" style="text-decoration: none">LDAPOpCacheEntries <em>number</em></a></td><td> 1024 </td><td /><td>s</td></tr><tr class="odd"><td colspan="4"> + Directory containing certificates for SSL support</td></tr> +<tr class="odd"><td><a href="mod_ldap.html#ldapopcacheentries" style="text-decoration: none">LDAPOpCacheEntries <em>number</em></a></td><td> 1024 </td><td>X</td><td>s</td></tr><tr class="odd"><td colspan="4"> - </td></tr> -<tr class="even"><td><a href="mod_ldap.html#ldapopcachettl" style="text-decoration: none">LDAPOpCacheTTL <em>seconds</em></a></td><td> 600 </td><td /><td>s</td></tr><tr class="even"><td colspan="4"> + Number of entries used to cache LDAP compare +operations</td></tr> +<tr class="even"><td><a href="mod_ldap.html#ldapopcachettl" style="text-decoration: none">LDAPOpCacheTTL <em>seconds</em></a></td><td> 600 </td><td>X</td><td>s</td></tr><tr class="even"><td colspan="4"> - </td></tr> -<tr class="odd"><td><a href="mod_ldap.html#ldapsharedcachesize" style="text-decoration: none">LDAPSharedCacheSize <em>bytes</em></a></td><td> 102400 </td><td /><td>s</td></tr><tr class="odd"><td colspan="4"> + Time that entries in the operation cache remain +valid</td></tr> +<tr class="odd"><td><a href="mod_ldap.html#ldapsharedcachesize" style="text-decoration: none">LDAPSharedCacheSize <em>bytes</em></a></td><td> 102400 </td><td>X</td><td>s</td></tr><tr class="odd"><td colspan="4"> - </td></tr> + Size in bytes of the shared-memory cache</td></tr> <tr class="even"><td><a href="core.html#limit" style="text-decoration: none"><Limit <em>method</em> [<em>method</em>] ... > ... </Limit></a></td><td /><td>C</td><td>svdh</td></tr><tr class="even"><td colspan="4"> @@ -647,10 +651,10 @@ listens to</td></tr> <tr class="even"><td><a href="mpm_common.html#listenbacklog" style="text-decoration: none">ListenBacklog <em>backlog</em></a></td><td /><td>M</td><td>s</td></tr><tr class="even"><td colspan="4"> Maximum length of the queue of pending connections</td></tr> -<tr class="odd"><td><a href="mod_so.html#loadfile" style="text-decoration: none">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td /><td /><td>s</td></tr><tr class="odd"><td colspan="4"> +<tr class="odd"><td><a href="mod_so.html#loadfile" style="text-decoration: none">LoadFile <em>filename</em> [<em>filename</em>] ...</a></td><td /><td>E</td><td>s</td></tr><tr class="odd"><td colspan="4"> Link in the named object file or library</td></tr> -<tr class="even"><td><a href="mod_so.html#loadmodule" style="text-decoration: none">LoadModule <em>module filename</em></a></td><td /><td /><td>s</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_so.html#loadmodule" style="text-decoration: none">LoadModule <em>module filename</em></a></td><td /><td>E</td><td>s</td></tr><tr class="even"><td colspan="4"> Links in the object file or library, and adds to the list of active modules</td></tr> @@ -741,15 +745,7 @@ searching for a matching file with MultiViews</td></tr> Designates an IP address for name-virtual hosting</td></tr> -<tr class="even"><td><a href="mod_proxy.html#noproxy" style="text-decoration: none">NoProxy - <em>Domain</em>| - <em>SubNet</em>| - <em>IpAddr</em>| - <em>Hostname</em> -[<em>Domain</em>| - <em>SubNet</em>| - <em>IpAddr</em>| - <em>Hostname</em>] ...</a></td><td /><td>E</td><td>sv</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_proxy.html#noproxy" style="text-decoration: none">NoProxy <em>host</em> [<em>host</em>] ...</a></td><td /><td>E</td><td>sv</td></tr><tr class="even"><td colspan="4"> Hosts, domains, or networks that will be connected to directly</td></tr> @@ -847,9 +843,8 @@ of the index listing</td></tr> a different URL</td></tr> <tr class="odd"><td><a href="mod_alias.html#redirectmatch" style="text-decoration: none">RedirectMatch [<em>status</em>] <em>regex URL</em></a></td><td /><td>B</td><td>svdh</td></tr><tr class="odd"><td colspan="4"> - Sends an external redirect asking the client to fetch -a different URL based on a regular expression match of the -current URL</td></tr> + Sends an external redirect based on a regular expression match +of the current URL</td></tr> <tr class="even"><td><a href="mod_alias.html#redirectpermanent" style="text-decoration: none">RedirectPermanent <em>URL-path URL</em></a></td><td /><td>B</td><td>svdh</td></tr><tr class="even"><td colspan="4"> Sends an external permanent redirect asking the client to fetch @@ -1055,8 +1050,7 @@ server</td></tr> </td><td>B</td><td>svdh</td></tr><tr class="odd"><td colspan="4"> Error message displayed when there is an SSI error</td></tr> -<tr class="even"><td><a href="mod_include.html#ssistarttag" style="text-decoration: none">Changes the string that mod_include looks for to start an -include element</a></td><td> "<!--" </td><td>B</td><td>sv</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_include.html#ssistarttag" style="text-decoration: none">SSIStartTag <em>tag</em></a></td><td> "<!--" </td><td>B</td><td>sv</td></tr><tr class="even"><td colspan="4"> String that starts an include element</td></tr> <tr class="odd"><td><a href="mod_include.html#ssitimeformat" style="text-decoration: none">SSITimeFormat <em>formatstring</em></a></td><td> "%A, %d-%b-%Y %H:%M @@ -1229,11 +1223,11 @@ requests</td></tr> <tr class="even"><td><a href="mod_userdir.html#userdir" style="text-decoration: none">UserDir <em>directory-filename</em></a></td><td> public_html </td><td>B</td><td>s</td></tr><tr class="even"><td colspan="4"> Location of the user-specific directories</td></tr> -<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" style="text-decoration: none">VirtualDocumentRoot <em>interpolated-directory</em></a></td><td /><td>E</td><td>sv</td></tr><tr class="odd"><td colspan="4"> +<tr class="odd"><td><a href="mod_vhost_alias.html#virtualdocumentroot" style="text-decoration: none">VirtualDocumentRoot <em>interpolated-directory</em>|none</a></td><td> none </td><td>E</td><td>sv</td></tr><tr class="odd"><td colspan="4"> Dynamically configure the location of the document root for a given virtual host</td></tr> -<tr class="even"><td><a href="mod_vhost_alias.html#virtualdocumentrootip" style="text-decoration: none">VirtualDocumentRootIP <em>interpolated-directory</em></a></td><td /><td>E</td><td>sv</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_vhost_alias.html#virtualdocumentrootip" style="text-decoration: none">VirtualDocumentRootIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>E</td><td>sv</td></tr><tr class="even"><td colspan="4"> Dynamically configure the location of the document root for a given virtual host</td></tr> @@ -1243,11 +1237,11 @@ for a given virtual host</td></tr> Contains directives that apply only to a specific hostname or IP address</td></tr> -<tr class="even"><td><a href="mod_vhost_alias.html#virtualscriptalias" style="text-decoration: none">VirtualScriptAlias <em>interpolated-directory</em></a></td><td /><td>E</td><td>sv</td></tr><tr class="even"><td colspan="4"> +<tr class="even"><td><a href="mod_vhost_alias.html#virtualscriptalias" style="text-decoration: none">VirtualScriptAlias <em>interpolated-directory</em>|none</a></td><td> none </td><td>E</td><td>sv</td></tr><tr class="even"><td colspan="4"> Dynamically configure the location of the CGI directory for a given virtual host</td></tr> -<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip" style="text-decoration: none">VirtualScriptAliasIP <em>interpolated-directory</em></a></td><td /><td>E</td><td>sv</td></tr><tr class="odd"><td colspan="4"> +<tr class="odd"><td><a href="mod_vhost_alias.html#virtualscriptaliasip" style="text-decoration: none">VirtualScriptAliasIP <em>interpolated-directory</em>|none</a></td><td> none </td><td>E</td><td>sv</td></tr><tr class="odd"><td colspan="4"> Dynamically configure the location of the cgi directory for a given virtual host</td></tr> |