Commit fcda55ec authored by Lars Eilebrecht's avatar Lars Eilebrecht
Browse files

mod_disk_cache now turns off sendfile support if 'EnableSendfile off' 

is defined globally.

Reviewed by: Ruediger Pluem, Issac Goldstand, Niklas Edmundsson



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@746552 13f79535-47bb-0310-9956-ffa450edef68
parent e3fa9486

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.12

  

  *) mod_disk_cache: The module now turns off sendfile support if

     'EnableSendfile off' is defined globally. PR 41218.

     [Lars Eilebrecht, Issac Goldstand]



 *) prefork: Fix child process hang during graceful restart/stop in

    configurations with multiple listening sockets.  PR 42829.  [Joe Orton,

    Jeff Trawick]

docs/manual/mod/core.html.de

+6 −0
Original line number Diff line number Diff line
@@ -978,6 +978,12 @@ Dateien an den Client auszuliefern</td></tr> 
      </span>

      &lt;/Directory&gt;

    </code></p></div>

    <p>Beachten Sie bitte, dass die verzeichnisbasierte und

       .htaccess-Konfiguration von <code class="directive">EnableSendfile</code>

       nicht vom <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>-Modul unterst\ufffdtzt wird.

       Nur die globale Konfiguration von <code class="directive">EnableSendfile</code>

       wird vom Modul beachtet.

    </p>



</div>

<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

docs/manual/mod/core.html.en

+6 −0
Original line number Diff line number Diff line
@@ -939,6 +939,12 @@ Locations</a></li> 
      </span>

      &lt;/Directory&gt;

    </code></p></div>

    <p>Please note that the per-directory and .htaccess configuration

       of <code class="directive">EnableSendfile</code> is not supported by

       <code class="module"><a href="../mod/mod_disk_cache.html">mod_disk_cache</a></code>.

       Only global definition of <code class="directive">EnableSendfile</code>

       is taken into account by the module.

    </p>



</div>

<div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>

docs/manual/mod/core.xml

+6 −0
Original line number Diff line number Diff line
@@ -903,6 +903,12 @@ Locations</a></seealso> 
      </indent>

      &lt;/Directory&gt;

    </example>

    <p>Please note that the per-directory and .htaccess configuration

       of <directive>EnableSendfile</directive> is not supported by

       <module>mod_disk_cache</module>.

       Only global definition of <directive>EnableSendfile</directive>

       is taken into account by the module.

    </p>

</usage>

</directivesynopsis>

docs/manual/mod/core.xml.de

+6 −0
Original line number Diff line number Diff line
@@ -925,6 +925,12 @@ Dateien an den Client auszuliefern</description> 
      </indent>

      &lt;/Directory&gt;

    </example>

    <p>Beachten Sie bitte, dass die verzeichnisbasierte und

       .htaccess-Konfiguration von <directive>EnableSendfile</directive>

       nicht vom <module>mod_disk_cache</module>-Modul unterst&uuml;tzt wird.

       Nur die globale Konfiguration von <directive>EnableSendfile</directive>

       wird vom Modul beachtet.

    </p>

</usage>

</directivesynopsis>