From c3653cb85cdcf5669573ecf62eff768da18ad649 Mon Sep 17 00:00:00 2001 From: Nilgun Belma Buguner Date: Fri, 22 Nov 2013 00:41:45 +0000 Subject: [PATCH] fixed validation errors git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1544385 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_cache.xml | 8 ++-- docs/manual/mod/mod_headers.xml | 6 +-- docs/manual/mod/mod_ldap.xml | 68 ++++++++++++++++----------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/docs/manual/mod/mod_cache.xml b/docs/manual/mod/mod_cache.xml index a0561cb4c0..dd05e275f7 100644 --- a/docs/manual/mod/mod_cache.xml +++ b/docs/manual/mod/mod_cache.xml @@ -162,7 +162,7 @@ LoadModule cache_module modules/mod_cache.so CacheDirLevels 5 CacheDirLength 3 </IfModule> - + # When acting as a proxy, don't cache the list of security updates CacheDisable http://security.update.server/update-list/ </IfModule> @@ -344,10 +344,10 @@ CustomLog invalidated-requests.log common env=cache-invalidate manager CacheEnable cache_type [url-string] server configvirtual host -directory +directory A url-string of '/' applied to forward proxy content in 2.2 and earlier. - +

The CacheEnable directive instructs @@ -374,7 +374,7 @@ manager LocationMatch sections are processed before globally defined CacheEnable directives.

-

When acting as a forward proxy server, url-string must +

When acting as a forward proxy server, url-string must minimally begin with a protocol for which caching should be enabled.

diff --git a/docs/manual/mod/mod_headers.xml b/docs/manual/mod/mod_headers.xml index fc8c46b00a..7650a60ba5 100644 --- a/docs/manual/mod/mod_headers.xml +++ b/docs/manual/mod/mod_headers.xml @@ -248,7 +248,7 @@ Header merge Cache-Control no-store env=NO_STORE
set
The request header is set, replacing any previous header with this name
- +
setifempty
The request header is set, but only if there is no previous header with this name
@@ -481,8 +481,8 @@ Header merge Cache-Control no-store env=NO_STORE

For edit there is both a value argument which is a regular expression, - and an additional replacement string.

As of version 2.4.7 - the replacement string may also contain format specifiers. + and an additional replacement string. As of version 2.4.7 + the replacement string may also contain format specifiers.

The Header directive may be followed by an additional argument, which may be any of:

diff --git a/docs/manual/mod/mod_ldap.xml b/docs/manual/mod/mod_ldap.xml index b6c7022d77..d1a85851dd 100644 --- a/docs/manual/mod/mod_ldap.xml +++ b/docs/manual/mod/mod_ldap.xml @@ -72,9 +72,9 @@ LDAPOpCacheTTL 600 <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + Satisfy any AuthType Basic AuthName "LDAP Protected" @@ -107,9 +107,9 @@ LDAPOpCacheTTL 600 credentials used when binding to an LDAP server. These credentials can be provided to LDAP servers that do not allow anonymous binds during referral chasing. To control - this feature, see the - LDAPReferrals and - LDAPReferralHopLimit + this feature, see the + LDAPReferrals and + LDAPReferralHopLimit directives. By default, this feature is enabled.

@@ -197,26 +197,26 @@ LDAPOpCacheTTL 600
Using SSL/TLS

The ability to create an SSL and TLS connections to an LDAP server - is defined by the directives - LDAPTrustedGlobalCert, + is defined by the directives + LDAPTrustedGlobalCert, LDAPTrustedClientCert - and LDAPTrustedMode. - These directives specify the CA and optional client certificates to be used, - as well as the type of encryption to be used on the connection (none, SSL or + and LDAPTrustedMode. + These directives specify the CA and optional client certificates to be used, + as well as the type of encryption to be used on the connection (none, SSL or TLS/STARTTLS).

-# Establish an SSL LDAP connection on port 636. Requires that -# mod_ldap and mod_authnz_ldap be loaded. Change the +# Establish an SSL LDAP connection on port 636. Requires that +# mod_ldap and mod_authnz_ldap be loaded. Change the # "yourdomain.example.com" to match your domain. LDAPTrustedGlobalCert CA_DER /certs/certfile.der <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + Satisfy any AuthType Basic AuthName "LDAP Protected" @@ -227,17 +227,17 @@ LDAPTrustedGlobalCert CA_DER /certs/certfile.der -# Establish a TLS LDAP connection on port 389. Requires that -# mod_ldap and mod_authnz_ldap be loaded. Change the +# Establish a TLS LDAP connection on port 389. Requires that +# mod_ldap and mod_authnz_ldap be loaded. Change the # "yourdomain.example.com" to match your domain. LDAPTrustedGlobalCert CA_DER /certs/certfile.der <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + Satisfy any AuthType Basic AuthName "LDAP Protected" @@ -356,9 +356,9 @@ LDAPTrustedGlobalCert CA_DER /certs/cacert1.der LDAPTrustedGlobalCert CA_BASE64 /certs/cacert2.pem <Location /ldap-status> SetHandler ldap-status - + Require host yourdomain.example.com - + LDAPTrustedClientCert CERT_BASE64 /certs/cert1.pem LDAPTrustedClientCert KEY_BASE64 /certs/key1.pem # CA certs respecified due to per-directory client certs @@ -515,31 +515,31 @@ valid

Some LDAP servers divide their directory among multiple domains and use referrals to direct a client when a domain boundary is crossed. This is similar to a HTTP redirect. - LDAP client libraries may or may not chase referrals by default. This directive - explicitly configures the referral chasing in the underlying SDK.

- - + LDAP client libraries may or may not chase referrals by default. This directive + explicitly configures the referral chasing in the underlying SDK.

+ +

LDAPReferrals takes the takes the following values: +

"on"

When set to "on", the underlying SDK's referral chasing state - is enabled, LDAPReferralHopLimit is used to - override the SDK's hop limit, and an LDAP rebind callback is + is enabled, LDAPReferralHopLimit is used to + override the SDK's hop limit, and an LDAP rebind callback is registered.

"off"

When set to "off", the underlying SDK's referral chasing state is disabled completely.

"default"

When set to "default", the underlying SDK's referral chasing state - is not changed, LDAPReferralHopLimit is not - used to overide the SDK's hop limit, and no LDAP rebind callback is + is not changed, LDAPReferralHopLimit is not + used to overide the SDK's hop limit, and no LDAP rebind callback is registered.

-

The directive LDAPReferralHopLimit works in conjunction with this directive to limit the number of referral hops to follow before terminating the LDAP query. - When referral processing is enabled by a value of "On", client credentials will be provided, + When referral processing is enabled by a value of "On", client credentials will be provided, via a rebind callback, for any LDAP server requiring them.

@@ -553,7 +553,7 @@ valid

If LDAPRetryDelay is set to a non-zero - value, the server will delay retrying an LDAP request for the + value, the server will delay retrying an LDAP request for the specified amount of time. Setting this directive to 0 will result in any retry to occur without delay.

@@ -568,7 +568,7 @@ valid LDAPRetries 3 server config -

The server will retry failed LDAP requests up to +

The server will retry failed LDAP requests up to LDAPRetries times. Setting this directive to 0 disables retries.

LDAP errors such as timeouts and refused connections are retryable.

@@ -754,10 +754,10 @@ connection client certificates. connection pool. The default value of -1, and any other negative value, allows connections of any age to be reused.

-

The timemout is based on when the LDAP connection is returned to the +

The timemout is based on when the LDAP connection is returned to the pool, not based on the last time I/O has been performed over the backend connection. If the information is cached, the apparent idle time can exceed - the LDAPConnectionPoolTTL.

+ the LDAPConnectionPoolTTL.

This timeout defaults to units of seconds, but accepts suffixes for milliseconds (ms), minutes (min), and hours (h). -- 2.50.1