httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yla...@apache.org
Subject svn commit: r1584684 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/mod/
Date Fri, 04 Apr 2014 13:45:10 GMT
Author: ylavic
Date: Fri Apr  4 13:45:10 2014
New Revision: 1584684

URL: http://svn.apache.org/r1584684
Log:
- Manual: merge modules' directives obsolete compatibilities.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_isapi.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_suexec.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1584572,1584653,1584658

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml Fri Apr  4 13:45:10 2014
@@ -32,8 +32,7 @@ available</description>
 <description>Configures optimizations for a Protocol's Listener Sockets</description>
 <syntax>AcceptFilter <var>protocol</var> <var>accept_filter</var></syntax>
 <contextlist><context>server config</context></contextlist>
-<compatibility>Available in Apache httpd 2.1.5 and later.
-On Windows from Apache httpd 2.3.3 and later.</compatibility>
+<compatibility>On Windows only.</compatibility>
 
 <usage>
     <p>This directive enables operating system specific optimizations for a
@@ -1338,7 +1337,6 @@ ErrorDocument 404 /cgi-bin/bad_urls.pl
 <syntax> ErrorLogFormat [connection|request] <var>format</var></syntax>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
-<compatibility>Available in Apache httpd 2.3.9 and later</compatibility>
 
 <usage>
     <p><directive>ErrorLogFormat</directive> allows to specify what
@@ -2178,8 +2176,6 @@ requests on a persistent connection</des
 <default>KeepAliveTimeout 5</default>
 <contextlist><context>server config</context><context>virtual host</context>
 </contextlist>
-<compatibility>Specifying a value in milliseconds is available in
-Apache httpd 2.3.2 and later</compatibility>
 
 <usage>
     <p>The number of seconds Apache httpd will wait for a subsequent

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_isapi.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_isapi.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_isapi.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_isapi.xml Fri Apr  4 13:45:10 2014
@@ -212,7 +212,7 @@
     <code>GetServerVariable</code>, as well as the <code>ALL_HTTP</code>
     and <code>ALL_RAW</code> values.</p>
 
-    <p>Apache httpd 2.0+ <module>mod_isapi</module> supports additional
+    <p>Since httpd 2.0, <module>mod_isapi</module> supports additional
     features introduced in later versions of the ISAPI specification,
     as well as limited emulation of async I/O and the
     <code>TransmitFile</code> semantics. Apache httpd also supports preloading

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_log_config.xml Fri Apr  4 13:45:10 2014
@@ -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.</p>
 
-      <p>In httpd 2.0, unlike 1.3, the <code>%b</code> and
+      <p>Since httpd 2.0, unlike 1.3, the <code>%b</code> and
       <code>%B</code> 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

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml Fri Apr  4 13:45:10 2014
@@ -1270,8 +1270,7 @@ ProxyPass / balancer://hotcluster/
     <directive module="mod_rewrite">RewriteRule</directive> directive with the
     <code>[P]</code> flag.</p>
 
-    <p>The optional <var>interpolate</var> keyword (available in
-    httpd 2.2.9 and later), in combination with
+    <p>The optional <var>interpolate</var> keyword, in combination with
     <directive>ProxyPassInterpolateEnv</directive> causes the ProxyPass
     to interpolate environment variables, using the syntax
     <var>${VARNAME}</var>.  Note that many of the standard CGI-derived
@@ -1421,8 +1420,7 @@ ProxyPassReverseCookiePath  /  /mirror/f
     because it doesn't depend on a corresponding <directive module="mod_proxy"
     >ProxyPass</directive> directive.</p>
 
-    <p>The optional <var>interpolate</var> keyword (available in
-    httpd 2.2.9 and later), used together with
+    <p>The optional <var>interpolate</var> keyword, used together with
     <directive>ProxyPassInterpolateEnv</directive>, enables interpolation
     of environment variables specified using the format <var>${VARNAME}</var>.
     Note that interpolation is not supported within the scheme portion of a

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_ssl.xml Fri Apr  4 13:45:10 2014
@@ -2127,7 +2127,6 @@ SSLUserName SSL_CLIENT_S_DN_CN
 <default>SSLHonorCipherOrder off</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in Apache 2.1 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>When choosing a cipher during an SSLv3 or TLSv1 handshake, normally
@@ -2175,7 +2174,6 @@ SSLCryptoDevice ubsec
 <default>SSLOCSPEnable off</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>This option enables OCSP validation of the client certificate
@@ -2206,7 +2204,6 @@ SSLOCSPOverrideResponder on
 <syntax>SSLOCSDefaultResponder <em>uri</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>This option sets the default OCSP responder to use.  If <directive
@@ -2223,7 +2220,6 @@ the certificate being verified.</p>
 <default>SSLOCSPOverrideResponder off</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>This option forces the configured default OCSP responder to be used
@@ -2239,7 +2235,6 @@ certificate being validated references a
 <default>SSLOCSPResponseTimeSkew 300</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>This option sets the maximum allowable time skew for OCSP responses
@@ -2254,7 +2249,6 @@ certificate being validated references a
 <default>SSLOCSPResponseMaxAge -1</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>This option sets the maximum allowable age ("freshness") for OCSP responses.
@@ -2271,7 +2265,6 @@ which means that OCSP responses are cons
 <default>SSLOCSPResponderTimeout 10</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3 and later, if using OpenSSL 0.9.7 or later</compatibility>
 
 <usage>
 <p>This option sets the timeout for queries to OCSP responders, when
@@ -2330,7 +2323,7 @@ supported for a given SSL connection.</p
 <default>SSLUseStapling off</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>This option enables OCSP stapling, as defined by the "Certificate
@@ -2358,7 +2351,7 @@ stated goal of "saving roundtrips and re
 <description>Configures the OCSP stapling cache</description>
 <syntax>SSLStaplingCache <em>type</em></syntax>
 <contextlist><context>server config</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>Configures the cache used to store OCSP responses which get included
@@ -2377,7 +2370,7 @@ the same storage types are supported as 
 <default>SSLStaplingResponseTimeSkew 300</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>This option sets the maximum allowable time skew when mod_ssl checks the
@@ -2394,7 +2387,7 @@ if <directive module="mod_ssl">SSLUseSta
 <default>SSLStaplingResponderTimeout 10</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>This option sets the timeout for queries to OCSP responders when
@@ -2410,7 +2403,7 @@ and mod_ssl is querying a responder for 
 <default>SSLStaplingResponseMaxAge -1</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>This option sets the maximum allowable age ("freshness") when
@@ -2429,7 +2422,7 @@ which means that OCSP responses are cons
 <default>SSLStaplingStandardCacheTimeout 3600</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>Sets the timeout in seconds before responses in the OCSP stapling cache
@@ -2448,7 +2441,7 @@ used for controlling the timeout for inv
 <default>SSLStaplingReturnResponderErrors on</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>When enabled, mod_ssl will pass responses from unsuccessful
@@ -2465,7 +2458,7 @@ for failed queries will be included in t
 <default>SSLStaplingFakeTryLater on</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>When enabled and a query to an OCSP responder for stapling
@@ -2483,7 +2476,7 @@ is also enabled.</p>
 <default>SSLStaplingErrorCacheTimeout 600</default>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>Sets the timeout in seconds before <em>invalid</em> responses
@@ -2500,7 +2493,7 @@ To set the cache timeout for valid respo
 <syntax>SSLStaplingForceURL <em>uri</em></syntax>
 <contextlist><context>server config</context>
 <context>virtual host</context></contextlist>
-<compatibility>Available in httpd 2.3.3 and later, if using OpenSSL 0.9.8h or later</compatibility>
+<compatibility>Available if using OpenSSL 0.9.8h or later</compatibility>
 
 <usage>
 <p>This directive overrides the URI of an OCSP responder as obtained from

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_suexec.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_suexec.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_suexec.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_suexec.xml Fri Apr  4 13:45:10 2014
@@ -59,8 +59,8 @@ and Group</description>
     </highlight>
     </example>
 
-    <p>In Apache httpd 2.3.9 and later, startup will fail if this
-    directive is specified but the suEXEC feature is disabled.</p>
+    <p>Startup will fail if this directive is specified but the suEXEC
+    feature is disabled.</p>
 </usage>
 <seealso><directive module="mod_unixd">Suexec</directive></seealso>
 </directivesynopsis>

Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml?rev=1584684&r1=1584683&r2=1584684&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_unixd.xml Fri Apr  4 13:45:10 2014
@@ -149,7 +149,6 @@ requests</description>
 <default>On if suexec binary exists with proper owner and mode,
 Off otherwise</default>
 <contextlist><context>server config</context></contextlist>
-<compatibility>Available in Apache httpd 2.3.9 and later</compatibility>
 
 <usage>
     <p>When On, startup will fail if the suexec binary doesn't exist



Mime
View raw message