Commit 38bd9cd7 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

merge of current 2.4.x and change 1702919 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1702925 13f79535-47bb-0310-9956-ffa450edef68
parents 07d7963f 4d2f14c3

STATUS

+1 −1
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     +1: jailletc36, ylavic

     +1: jailletc36, ylavic









  *) Allow autoindexes to work without mod_dir or mod_mime

  *) mod_autoindex: Allow autoindexes to work without mod_dir or mod_mime

     trunk: http://svn.apache.org/r1701436

     trunk: http://svn.apache.org/r1701436

     2.4.x: trunk works

     2.4.x: trunk works

     +1: covener

     +1: covener

docs/manual/mod/directives.html.de

+1 −0
Original line number Original line Diff line number Diff line
@@ -385,6 +385,7 @@ 
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mod_socache_memcache.html#memcacheconnttl">MemcacheConnTTL</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

docs/manual/mod/directives.html.en

+1 −0
Original line number Original line Diff line number Diff line
@@ -386,6 +386,7 @@ 
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mod_socache_memcache.html#memcacheconnttl">MemcacheConnTTL</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

docs/manual/mod/directives.html.es

+1 −0
Original line number Original line Diff line number Diff line
@@ -388,6 +388,7 @@ 
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mod_socache_memcache.html#memcacheconnttl">MemcacheConnTTL</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

docs/manual/mod/directives.html.fr

+1 −0
Original line number Original line Diff line number Diff line
@@ -386,6 +386,7 @@ 
<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="prefork.html#maxspareservers">MaxSpareServers</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_common.html#maxsparethreads">MaxSpareThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mpm_netware.html#maxthreads">MaxThreads</a></li>

<li><a href="mod_socache_memcache.html#memcacheconnttl">MemcacheConnTTL</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="core.html#mergetrailers">MergeTrailers</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metadir">MetaDir</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>

<li><a href="mod_cern_meta.html#metafiles">MetaFiles</a></li>