From: Yann Ylavic Date: Fri, 4 Apr 2014 13:45:10 +0000 (+0000) Subject: - Manual: merge modules' directives obsolete compatibilities. X-Git-Tag: 2.4.10~383 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7bf1f8e514d752061b9fe28ebe737bdff5148ad4;p=apache - Manual: merge modules' directives obsolete compatibilities. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1584684 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.xml b/docs/manual/mod/core.xml index 89401181c1..51c2e29b9c 100644 --- a/docs/manual/mod/core.xml +++ b/docs/manual/mod/core.xml @@ -32,8 +32,7 @@ available Configures optimizations for a Protocol's Listener Sockets AcceptFilter protocol accept_filter server config -Available in Apache httpd 2.1.5 and later. -On Windows from Apache httpd 2.3.3 and later. +On Windows only.

This directive enables operating system specific optimizations for a @@ -1338,7 +1337,6 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl ErrorLogFormat [connection|request] format server configvirtual host -Available in Apache httpd 2.3.9 and later

ErrorLogFormat allows to specify what @@ -2178,8 +2176,6 @@ requests on a persistent connection KeepAliveTimeout 5 server configvirtual host -Specifying a value in milliseconds is available in -Apache httpd 2.3.2 and later

The number of seconds Apache httpd will wait for a subsequent diff --git a/docs/manual/mod/mod_isapi.xml b/docs/manual/mod/mod_isapi.xml index 9f4bdef4ea..3b10c9e861 100644 --- a/docs/manual/mod/mod_isapi.xml +++ b/docs/manual/mod/mod_isapi.xml @@ -212,7 +212,7 @@ GetServerVariable, as well as the ALL_HTTP and ALL_RAW values.

-

Apache httpd 2.0+ mod_isapi supports additional +

Since httpd 2.0, mod_isapi supports additional features introduced in later versions of the ISAPI specification, as well as limited emulation of async I/O and the TransmitFile semantics. Apache httpd also supports preloading diff --git a/docs/manual/mod/mod_log_config.xml b/docs/manual/mod/mod_log_config.xml index a503aa52da..bbd7f642a4 100644 --- a/docs/manual/mod/mod_log_config.xml +++ b/docs/manual/mod/mod_log_config.xml @@ -318,7 +318,7 @@ prior to 2.0.46, no escaping was performed on these strings so you had to be quite careful when dealing with raw log files.

-

In httpd 2.0, unlike 1.3, the %b and +

Since 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 diff --git a/docs/manual/mod/mod_proxy.xml b/docs/manual/mod/mod_proxy.xml index 57e72c3e7d..9bd4ebb399 100644 --- a/docs/manual/mod/mod_proxy.xml +++ b/docs/manual/mod/mod_proxy.xml @@ -1270,8 +1270,7 @@ ProxyPass / balancer://hotcluster/ RewriteRule directive with the [P] flag.

-

The optional interpolate keyword (available in - httpd 2.2.9 and later), in combination with +

The optional interpolate keyword, in combination with ProxyPassInterpolateEnv causes the ProxyPass to interpolate environment variables, using the syntax ${VARNAME}. Note that many of the standard CGI-derived @@ -1421,8 +1420,7 @@ ProxyPassReverseCookiePath / /mirror/foo/ because it doesn't depend on a corresponding ProxyPass directive.

-

The optional interpolate keyword (available in - httpd 2.2.9 and later), used together with +

The optional interpolate keyword, used together with ProxyPassInterpolateEnv, enables interpolation of environment variables specified using the format ${VARNAME}. Note that interpolation is not supported within the scheme portion of a diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index b9607b4ada..582dbd1cb4 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -2127,7 +2127,6 @@ SSLUserName SSL_CLIENT_S_DN_CN SSLHonorCipherOrder off server config virtual host -Available in Apache 2.1 and later, if using OpenSSL 0.9.7 or later

When choosing a cipher during an SSLv3 or TLSv1 handshake, normally @@ -2175,7 +2174,6 @@ SSLCryptoDevice ubsec SSLOCSPEnable off server config virtual host -Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later

This option enables OCSP validation of the client certificate @@ -2206,7 +2204,6 @@ SSLOCSPOverrideResponder on SSLOCSDefaultResponder uri server config virtual host -Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later

This option sets the default OCSP responder to use. If SSLOCSPOverrideResponder off server config virtual host -Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later

This option forces the configured default OCSP responder to be used @@ -2239,7 +2235,6 @@ certificate being validated references an OCSP responder.

SSLOCSPResponseTimeSkew 300 server config virtual host -Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later

This option sets the maximum allowable time skew for OCSP responses @@ -2254,7 +2249,6 @@ certificate being validated references an OCSP responder.

SSLOCSPResponseMaxAge -1 server config virtual host -Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later

This option sets the maximum allowable age ("freshness") for OCSP responses. @@ -2271,7 +2265,6 @@ which means that OCSP responses are considered valid as long as their SSLOCSPResponderTimeout 10 server config virtual host -Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later

This option sets the timeout for queries to OCSP responders, when @@ -2330,7 +2323,7 @@ supported for a given SSL connection.

SSLUseStapling off server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

This option enables OCSP stapling, as defined by the "Certificate @@ -2358,7 +2351,7 @@ stated goal of "saving roundtrips and resources" - see also Configures the OCSP stapling cache SSLStaplingCache type server config -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

Configures the cache used to store OCSP responses which get included @@ -2377,7 +2370,7 @@ the same storage types are supported as with SSLStaplingResponseTimeSkew 300 server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

This option sets the maximum allowable time skew when mod_ssl checks the @@ -2394,7 +2387,7 @@ if SSLUseStapling is turned on.

SSLStaplingResponderTimeout 10 server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

This option sets the timeout for queries to OCSP responders when @@ -2410,7 +2403,7 @@ and mod_ssl is querying a responder for OCSP stapling purposes.

SSLStaplingResponseMaxAge -1 server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

This option sets the maximum allowable age ("freshness") when @@ -2429,7 +2422,7 @@ which means that OCSP responses are considered valid as long as their SSLStaplingStandardCacheTimeout 3600 server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

Sets the timeout in seconds before responses in the OCSP stapling cache @@ -2448,7 +2441,7 @@ used for controlling the timeout for invalid/unavailable responses. SSLStaplingReturnResponderErrors on server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

When enabled, mod_ssl will pass responses from unsuccessful @@ -2465,7 +2458,7 @@ for failed queries will be included in the TLS handshake.

SSLStaplingFakeTryLater on server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

When enabled and a query to an OCSP responder for stapling @@ -2483,7 +2476,7 @@ is also enabled.

SSLStaplingErrorCacheTimeout 600 server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

Sets the timeout in seconds before invalid responses @@ -2500,7 +2493,7 @@ To set the cache timeout for valid responses, see SSLStaplingForceURL uri server config virtual host -Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later +Available if using OpenSSL 0.9.8h or later

This directive overrides the URI of an OCSP responder as obtained from diff --git a/docs/manual/mod/mod_suexec.xml b/docs/manual/mod/mod_suexec.xml index fea3e574e0..65bb70e408 100644 --- a/docs/manual/mod/mod_suexec.xml +++ b/docs/manual/mod/mod_suexec.xml @@ -59,8 +59,8 @@ and Group -

In Apache httpd 2.3.9 and later, startup will fail if this - directive is specified but the suEXEC feature is disabled.

+

Startup will fail if this directive is specified but the suEXEC + feature is disabled.

 Suexec diff --git a/docs/manual/mod/mod_unixd.xml b/docs/manual/mod/mod_unixd.xml index 46a750ac4e..4b70219a87 100644 --- a/docs/manual/mod/mod_unixd.xml +++ b/docs/manual/mod/mod_unixd.xml @@ -149,7 +149,6 @@ requests On if suexec binary exists with proper owner and mode, Off otherwise server config -Available in Apache httpd 2.3.9 and later

When On, startup will fail if the suexec binary doesn't exist