httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jaillet...@apache.org
Subject svn commit: r1585830 - in /httpd/httpd/branches/2.4.x/docs/manual/mod: core.xml mod_proxy.xml
Date Tue, 08 Apr 2014 20:29:25 GMT
Author: jailletc36
Date: Tue Apr  8 20:29:24 2014
New Revision: 1585830

URL: http://svn.apache.org/r1585830
Log:
Add <compatibility> notes for changes made in version 2.4.2 + fix a typo not backported
in 2.4 branch

Modified:
    httpd/httpd/branches/2.4.x/docs/manual/mod/core.xml
    httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml

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=1585830&r1=1585829&r2=1585830&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 Tue Apr  8 20:29:24 2014
@@ -608,6 +608,7 @@ headers</description>
 <syntax>DefaultRuntimeDir <var>directory-path</var></syntax>
 <default>DefaultRuntimeDir DEFAULT_REL_RUNTIMEDIR (logs/)</default>
 <contextlist><context>server config</context></contextlist>
+<compatibility>Available in Apache 2.4.2 and later</compatibility>
 
 <usage>
     <p>The <directive>DefaultRuntimeDir</directive> directive sets the
@@ -1746,9 +1747,9 @@ filenames</description>
     (unnamed) backreferences are ignored. Use named groups instead.</p>
 
 <highlight language="config">
-&lt;FileMatch ^(?&lt;sitename&gt;[^/]+)&gt;
+&lt;FilesMatch ^(?&lt;sitename&gt;[^/]+)&gt;
     require ldap-group cn=%{env:MATCH_SITENAME},ou=combined,o=Example
-&lt;/FileMatch&gt;
+&lt;/FilesMatch&gt;
 </highlight>
 </usage>
 

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=1585830&r1=1585829&r2=1585830&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 Tue Apr  8 20:29:24 2014
@@ -831,7 +831,7 @@ expressions</description>
 
     <note><strong>Note: </strong>This directive cannot be used within a

     <code>&lt;Directory&gt;</code> context.</note>
-    
+
     <note type="warning">The <directive
     module="mod_proxy">ProxyRequests</directive> directive should
     usually be set <strong>off</strong> when using
@@ -1185,7 +1185,7 @@ ProxyPass /mirror/foo http://backend.exa
         <td>Off</td>
         <td>If set, an IO read timeout after a request is sent to the backend will
         force the worker into error state. Worker recovery behaves the same as other
-        worker errors.
+        worker errors.<br />
         Available in Apache HTTP Server 2.4.5 and later.
     </td></tr>
     <tr><td>nonce</td>
@@ -1212,7 +1212,8 @@ ProxyPass /mirror/foo http://backend.exa
         in error state. There might be cases where an already overloaded backend
         can get into deeper trouble if the recovery of all workers is enforced
         without considering the retry parameter of each worker. In this case
-        set to <code>Off</code>.
+        set to <code>Off</code>.<br />
+        Available in Apache HTTP Server 2.4.2 and later.
     </td></tr>
 
     </table>



Mime
View raw message