From: André Malo Date: Fri, 28 Jan 2005 17:41:29 +0000 (+0000) Subject: update transformation X-Git-Tag: 2.1.3~99 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e7aa665f0d110a66290605790719eff8739e77e;p=thirdparty%2Fapache%2Fhttpd.git update transformation git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@148907 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/directives.html.de b/docs/manual/mod/directives.html.de index 52dccaed82b..08d6149dd77 100644 --- a/docs/manual/mod/directives.html.de +++ b/docs/manual/mod/directives.html.de @@ -211,6 +211,7 @@
  • LanguagePriority
  • LDAPCacheEntries
  • LDAPCacheTTL
    • +
  • LDAPConnectionTimeout
  • LDAPOpCacheEntries
  • LDAPOpCacheTTL
  • LDAPSharedCacheFile
    • diff --git a/docs/manual/mod/directives.html.en b/docs/manual/mod/directives.html.en index b345d9bcba7..a68ab6b6b3e 100644 --- a/docs/manual/mod/directives.html.en +++ b/docs/manual/mod/directives.html.en @@ -212,6 +212,7 @@
  • LanguagePriority
  • LDAPCacheEntries
  • LDAPCacheTTL
    • +
  • LDAPConnectionTimeout
  • LDAPOpCacheEntries
  • LDAPOpCacheTTL
  • LDAPSharedCacheFile
    • diff --git a/docs/manual/mod/directives.html.es b/docs/manual/mod/directives.html.es index cddebbc1b70..aba132c2af5 100644 --- a/docs/manual/mod/directives.html.es +++ b/docs/manual/mod/directives.html.es @@ -214,6 +214,7 @@
  • LanguagePriority
  • LDAPCacheEntries
  • LDAPCacheTTL
    • +
  • LDAPConnectionTimeout
  • LDAPOpCacheEntries
  • LDAPOpCacheTTL
  • LDAPSharedCacheFile
    • diff --git a/docs/manual/mod/directives.html.ja.euc-jp b/docs/manual/mod/directives.html.ja.euc-jp index 7086b062f92..7b453788b36 100644 --- a/docs/manual/mod/directives.html.ja.euc-jp +++ b/docs/manual/mod/directives.html.ja.euc-jp @@ -209,6 +209,7 @@
  • LanguagePriority
  • LDAPCacheEntries
  • LDAPCacheTTL
    • +
  • LDAPConnectionTimeout
  • LDAPOpCacheEntries
  • LDAPOpCacheTTL
  • LDAPSharedCacheFile
    • diff --git a/docs/manual/mod/directives.html.ko.euc-kr b/docs/manual/mod/directives.html.ko.euc-kr index 89cddd2d081..a77b5ec2978 100644 --- a/docs/manual/mod/directives.html.ko.euc-kr +++ b/docs/manual/mod/directives.html.ko.euc-kr @@ -209,6 +209,7 @@
  • LanguagePriority
  • LDAPCacheEntries
  • LDAPCacheTTL
    • +
  • LDAPConnectionTimeout
  • LDAPOpCacheEntries
  • LDAPOpCacheTTL
  • LDAPSharedCacheFile
    • diff --git a/docs/manual/mod/mod_ldap.html.en b/docs/manual/mod/mod_ldap.html.en index 45e25f7edd7..90b239e3863 100644 --- a/docs/manual/mod/mod_ldap.html.en +++ b/docs/manual/mod/mod_ldap.html.en @@ -25,7 +25,7 @@ - +
    Description:LDAP connection pooling and result caching services for use by other LDAP modules
    Status:Experimental
    Status:Extension
    Module Identifier:ldap_module
    Source File:util_ldap.c
    Compatibility:Available in version 2.0.41 and later
    @@ -42,17 +42,23 @@ by other LDAP modules flag to the configure script when building Apache.

    -

    SSL support requires that mod_ldap be linked - with one of the following LDAP SDKs: - OpenLDAP SDK (both 1.x and 2.x), - Novell LDAP SDK, native Solaris LDAP SDK, native Microsoft LDAP SDK, or the - iPlanet(Netscape) SDK.

    +

    SSL/TLS support is dependant on which LDAP toolkit has been + linked to APR. As of this writing, APR-util supports: + OpenLDAP SDK (2.x or later), + Novell LDAP + SDK, + Mozilla LDAP SDK, native Solaris LDAP SDK (Mozilla based), + native Microsoft LDAP SDK, or the + iPlanet + (Netscape) SDK. See the APR + website for details.

    Directives

    @@ -398,7 +413,7 @@ by other LDAP modules Syntax:LDAPCacheEntries number Default:LDAPCacheEntries 1024 Context:server config -Status:Experimental +Status:Extension Module:mod_ldap

    Specifies the maximum size of the primary LDAP cache. This @@ -414,13 +429,29 @@ by other LDAP modules Syntax:LDAPCacheTTL seconds Default:LDAPCacheTTL 600 Context:server config -Status:Experimental +Status:Extension Module:mod_ldap

    Specifies the time (in seconds) that an item in the search/bind cache remains valid. The default is 600 seconds (10 minutes).

    + +
    top
    +

    LDAPConnectionTimeout Directive

    + + + + + + +
    Description:Specifies the socket connection timeout in seconds
    Syntax:LDAPConnectionTimeout seconds
    Context:server config
    Status:Extension
    Module:mod_ldap
    +

    Specifies the timeout value (in seconds) in which the module will + attempt to connect to the LDAP server. If a connection is not + successful with the timeout period, either an error will be + returned or the module will attempt to connect to a secondary LDAP + server if one is specified. The default is 10 seconds.

    +
    top

    LDAPOpCacheEntries Directive

    @@ -430,7 +461,7 @@ operations Syntax:LDAPOpCacheEntries number Default:LDAPOpCacheEntries 1024 Context:server config -Status:Experimental +Status:Extension Module:mod_ldap

    This specifies the number of entries mod_ldap @@ -446,7 +477,7 @@ valid Syntax:LDAPOpCacheTTL seconds Default:LDAPOpCacheTTL 600 Context:server config -Status:Experimental +Status:Extension Module:mod_ldap

    Specifies the time (in seconds) that entries in the @@ -459,7 +490,7 @@ valid Description:Sets the shared memory cache file Syntax:LDAPSharedCacheFile directory-path/filename Context:server config -Status:Experimental +Status:Extension Module:mod_ldap

    Specifies the directory path and file name of the shared memory @@ -474,7 +505,7 @@ valid Syntax:LDAPSharedCacheSize bytes Default:LDAPSharedCacheSize 102400 Context:server config -Status:Experimental +Status:Extension Module:mod_ldap

    Specifies the number of bytes to allocate for the shared @@ -490,13 +521,18 @@ connection client certificate. Not all LDAP toolkits support per connection client certificates. Syntax:LDAPTrustedClientCert type directory-path/filename/nickname [password] Context:server config, virtual host, directory, .htaccess -Status:Experimental +Status:Extension Module:mod_ldap

    It specifies the directory path, file name or nickname of a per connection client certificate used when establishing an SSL - or TLS connection to an LDAP server. Not all LDAP toolkits support - per connection client certificates (See the toolkit guide for details). + or TLS connection to an LDAP server. Different locations or + directories may have their own independant client certificate + settings. Some LDAP toolkits (notably Novell) + do not support per connection client certificates, and will throw an + error on LDAP server connection if you try to use this directive + (Use the LDAPTrustedGlobalCert directive instead for Novell client + certificates - See the SSL/TLS certificate guide above for details). The type specifies the kind of certificate parameter being set, depending on the LDAP toolkit being used. Supported types are:

    @@ -543,7 +589,7 @@ Certificate Authority or global client certificates Description:Specifies the SSL/TLS mode to be used when connecting to an LDAP server. Syntax:LDAPTrustedMode type Context:server config, virtual host, directory, .htaccess -Status:Experimental +Status:Extension Module:mod_ldap

    The following modes are supported:

    diff --git a/docs/manual/mod/mod_log_config.html.en b/docs/manual/mod/mod_log_config.html.en index 89af06731c4..856f46ea9f0 100644 --- a/docs/manual/mod/mod_log_config.html.en +++ b/docs/manual/mod/mod_log_config.html.en @@ -84,9 +84,9 @@ %...A Local IP-address %...B - Bytes sent, excluding HTTP headers. + Size of response in bytes, excluding HTTP headers. %...b - Bytes sent, excluding HTTP headers. In CLF format, i.e. + Size of response in bytes, excluding HTTP headers. In CLF format, i.e. a '-' rather than a 0 when no bytes are sent. %...{Foobar}C The contents of cookie Foobar in the request sent @@ -214,6 +214,14 @@ a backslash, and all whitespace characters which are written in their C-style notation (\n, \t etc).

    +

    Note that in httpd 2.0, unlike 1.3, the %b and + %B format strings do not represent the number of + bytes sent to the client, but simply the size in bytes of the HTTP + response (which will differ, for instance, if the connection is + aborted, or if SSL is used). The %O format provided + by mod_logio will log the actual number of bytes + sent over the network.

    +

    Some commonly used log format strings are:

    diff --git a/docs/manual/mod/mod_log_config.xml.ja b/docs/manual/mod/mod_log_config.xml.ja index 61b2b72342d..46f54a3dfe6 100644 --- a/docs/manual/mod/mod_log_config.xml.ja +++ b/docs/manual/mod/mod_log_config.xml.ja @@ -1,7 +1,7 @@ - + +