httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sl...@apache.org
Subject cvs commit: httpd-2.0/docs/manual/mod core.xml core.html.en
Date Sun, 10 Nov 2002 20:31:16 GMT
slive       2002/11/10 12:31:16

  Modified:    docs/manual/mod core.xml core.html.en
  Log:
  Fix a couple problems with the EnableSendFile docs:
  
  1. Add a <compatibility> line.
  2. Mention SMB in addition to NFS.
  3. Fix a couple small gramatical things.
  4. <example> is not a <pre> environment.
  
  Revision  Changes    Path
  1.43      +11 -8     httpd-2.0/docs/manual/mod/core.xml
  
  Index: core.xml
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.xml,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -d -b -u -r1.42 -r1.43
  --- core.xml	7 Nov 2002 12:29:27 -0000	1.42
  +++ core.xml	10 Nov 2002 20:31:16 -0000	1.43
  @@ -718,9 +718,10 @@
   <context>directory</context><context>.htaccess</context>
   </contextlist>
   <override>FileInfo</override>
  +<compatibility>Available in version 2.0.44 and later</compatibility>
   
   <usage>
  -    <p>This directive controls whether the httpd may use the sendfile
  +    <p>This directive controls whether httpd may use the sendfile
       support from the kernel to transmit file contents to the client.
       By default, when the handling of a request requires no access
       to the data within a file -- for example, when delivering a
  @@ -735,10 +736,12 @@
       <ul>
       <li>Some platforms may have broken sendfile support that the build
       system did not detect, especially if the binaries were built on
  -    another box and moved to such a machine with broken sendfile support.</li>
  -    <li>With an NFS-mounted <directive module="core">DocumentRoot</directive>,
  +    another box and moved to such a machine with broken sendfile
  +    support.</li> 
  +    <li>With a network-mounted <directive
  +    module="core">DocumentRoot</directive> (e.g., NFS or SMB), 
       the kernel may be unable to serve the network file through 
  -    it's own cache.</li>
  +    its own cache.</li>
       </ul>
   
       <p>For server configurations that are vulnerable to these problems,
  @@ -748,12 +751,12 @@
         EnableSendfile off
       </example>
   
  -    <p>For NFS mounted files, this feature may be disabled explicitly for
  -    the offending files by specifying:</p>
  +    <p>For NFS or SMB mounted files, this feature may be disabled explicitly 
  +    for the offending files by specifying:</p>
   
       <example>
  -      &lt;Directory "/path-to-nfs-files"&gt;
  -            EnableSendfile off
  +      &lt;Directory "/path-to-nfs-files"&gt;<br />
  +            EnableSendfile off<br />
         &lt;/Directory&gt;
       </example>
   </usage>
  
  
  
  1.44      +11 -9     httpd-2.0/docs/manual/mod/core.html.en
  
  Index: core.html.en
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/docs/manual/mod/core.html.en,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -d -b -u -r1.43 -r1.44
  --- core.html.en	7 Nov 2002 12:29:27 -0000	1.43
  +++ core.html.en	10 Nov 2002 20:31:16 -0000	1.44
  @@ -642,8 +642,9 @@
                 </a></th><td>server config, virtual host, directory, .htaccess</td></tr><tr><th><a
href="directive-dict.html#Override">Override:
                 </a></th><td>FileInfo</td></tr><tr><th><a
href="directive-dict.html#Status">Status:
                 </a></th><td>Core</td></tr><tr><th><a
href="directive-dict.html#Module">Module:
  -              </a></th><td>core</td></tr></table>
  -    <p>This directive controls whether the httpd may use the sendfile
  +              </a></th><td>core</td></tr><tr><th><a
href="directive-dict.html#Compatibility">Compatibility:
  +              </a></th><td>Available in version 2.0.44 and later</td></tr></table>
  +    <p>This directive controls whether httpd may use the sendfile
       support from the kernel to transmit file contents to the client.
       By default, when the handling of a request requires no access
       to the data within a file -- for example, when delivering a
  @@ -658,10 +659,11 @@
       <ul>
       <li>Some platforms may have broken sendfile support that the build
       system did not detect, especially if the binaries were built on
  -    another box and moved to such a machine with broken sendfile support.</li>
  -    <li>With an NFS-mounted <code class="directive"><a href="#documentroot">DocumentRoot</a></code>,
  +    another box and moved to such a machine with broken sendfile
  +    support.</li> 
  +    <li>With a network-mounted <code class="directive"><a href="#documentroot">DocumentRoot</a></code>
(e.g., NFS or SMB), 
       the kernel may be unable to serve the network file through 
  -    it's own cache.</li>
  +    its own cache.</li>
       </ul>
   
       <p>For server configurations that are vulnerable to these problems,
  @@ -671,12 +673,12 @@
         EnableSendfile off
       </code></p></div>
   
  -    <p>For NFS mounted files, this feature may be disabled explicitly for
  -    the offending files by specifying:</p>
  +    <p>For NFS or SMB mounted files, this feature may be disabled explicitly 
  +    for the offending files by specifying:</p>
   
       <div class="example"><p><code>
  -      &lt;Directory "/path-to-nfs-files"&gt;
  -            EnableSendfile off
  +      &lt;Directory "/path-to-nfs-files"&gt;<br />
  +            EnableSendfile off<br />
         &lt;/Directory&gt;
       </code></p></div>
   </div><div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif"
/></a></div><div class="directive-section"><h2><a name="ErrorDocument"
id="ErrorDocument">ErrorDocument</a> <a name="errordocument" id="errordocument">Directive</a></h2><table
class="directive"><tr><th><a href="directive-dict.html#Description">Description:

  
  
  

Mime
View raw message