Commit 959d034e authored by Joe Orton's avatar Joe Orton
Browse files

Transforms. 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1857629 13f79535-47bb-0310-9956-ffa450edef68
parent 1bd50c90

docs/manual/mod/core.html.en

+27 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ available</td></tr> 
<li><img alt="" src="../images/down.gif" /> <a href="#maxrangeoverlaps">MaxRangeOverlaps</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#maxrangereversals">MaxRangeReversals</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#maxranges">MaxRanges</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#mergeslashes">MergeSlashes</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#mergetrailers">MergeTrailers</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#mutex">Mutex</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#namevirtualhost">NameVirtualHost</a></li>
@@ -3619,6 +3620,32 @@ resource </td></tr> 
      server is willing to satisfy.</dd>

    </dl>



</div>

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

<div class="directive-section"><h2><a name="MergeSlashes" id="MergeSlashes">MergeSlashes</a> <a name="mergeslashes" id="mergeslashes">Directive</a> <a title="Permanent link" href="#mergeslashes" class="permalink">&para;</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Controls whether the server merges consecutive slashes in URLs.

</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MergeSlashes ON|OFF</code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>MergeSlashes ON</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</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>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Added in 2.5.1</td></tr>

</table>

    <p>By default, the server merges (or collapses) multiple consecutive slash

    ('/') characters in the path component of the request URL.</p>



    <p>When mapping URL's to the filesystem, these multiple slashes are not 

    significant.  However, URL's handled other ways, such as by CGI or proxy,

    might prefer to retain the significance of multiple consecutive slashes. 

    In these cases <code class="directive">MergeSlashes</code> can be set to 

    <em>OFF</em> to retain the multiple consecutive slashes.  In these

    configurations, regular expressions used in the configuration file that match

    the path component of the URL (<code class="directive">LocationMatch</code>,

    <code class="directive">RewriteRule</code>, ...) need to take into account multiple 

    consecutive slashes.</p>



</div>

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

<div class="directive-section"><h2><a name="MergeTrailers" id="MergeTrailers">MergeTrailers</a> <a name="mergetrailers" id="mergetrailers">Directive</a> <a title="Permanent link" href="#mergetrailers" class="permalink">&para;</a></h2>

docs/manual/mod/directives.html.en

+4 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ 
<li><a href="mod_http2.html#h2maxworkers">H2MaxWorkers</a></li>

<li><a href="mod_http2.html#h2minworkers">H2MinWorkers</a></li>

<li><a href="mod_http2.html#h2moderntlsonly">H2ModernTLSOnly</a></li>

<li><a href="mod_http2.html#h2padding">H2Padding</a></li>

<li><a href="mod_http2.html#h2push">H2Push</a></li>

<li><a href="mod_http2.html#h2pushdiarysize">H2PushDiarySize</a></li>

<li><a href="mod_http2.html#h2pushpriority">H2PushPriority</a></li>
@@ -469,11 +470,13 @@ 
<li><a href="mod_md.html#mdrequirehttps">MDRequireHttps</a></li>

<li><a href="mod_md.html#mdstoredir">MDStoreDir</a></li>

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

<li><a href="core.html#mergeslashes">MergeSlashes</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#metafiles">MetaFiles</a></li>

<li><a href="mod_cern_meta.html#metasuffix">MetaSuffix</a></li>

<li><a href="mod_mime_magic.html#mimemagicfile">MimeMagicFile</a></li>

<li><a href="mod_mime.html#mimeoptions">MimeOptions</a></li>

<li><a href="prefork.html#minspareservers">MinSpareServers</a></li>

<li><a href="mpm_common.html#minsparethreads">MinSpareThreads</a></li>

<li><a href="mod_file_cache.html#mmapfile">MMapFile</a></li>
@@ -516,6 +519,7 @@ 
<li><a href="core.html#protocols">Protocols</a></li>

<li><a href="core.html#protocolshonororder">ProtocolsHonorOrder</a></li>

<li><a href="mod_proxy.html#proxy">&lt;Proxy&gt;</a></li>

<li><a href="mod_proxy.html#proxy100continue">Proxy100Continue</a></li>

<li><a href="mod_proxy.html#proxyaddheaders">ProxyAddHeaders</a></li>

<li><a href="mod_proxy.html#proxybadheader">ProxyBadHeader</a></li>

<li><a href="mod_proxy.html#proxyblock">ProxyBlock</a></li>

docs/manual/mod/mod_http2.html.en

+37 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ 
<li><img alt="" src="../images/down.gif" /> <a href="#h2maxworkers">H2MaxWorkers</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#h2minworkers">H2MinWorkers</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#h2moderntlsonly">H2ModernTLSOnly</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#h2padding">H2Padding</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#h2push">H2Push</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#h2pushdiarysize">H2PushDiarySize</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#h2pushpriority">H2PushPriority</a></li>
@@ -434,6 +435,42 @@ 
            <div class="example"><h3>Example</h3><pre class="prettyprint lang-config">H2ModernTLSOnly off</pre>

</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="H2Padding" id="H2Padding">H2Padding</a> <a name="h2padding" id="h2padding">Directive</a> <a title="Permanent link" href="#h2padding" class="permalink">&para;</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Determine the range of padding bytes added to payload frames</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>H2Padding numbits</code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>H2Padding 0</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_http2</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4.39 and later.</td></tr>

</table>

            <p>

                With the default 0, no padding bytes are added to any payload

                frames, e.g. HEADERS, DATA and PUSH_PROMISE. This is the behaviour

                of previous versions. It means that under certain conditions, an

                observer of network traffic can see the length of those frames 

                in the TLS stream.

            </p>

            <p>

                When configuring numbits of 1-8, a random number in range

                [0, 2^numbits[ are added to each frame. The random value is chosen

                independantly for each frame that the module sends back to the client.

            </p>

            <p>

                While more padding bytes give better message length obfuscation, they

                are also additional traffic. The optimal number therefore depends on

                the kind of web traffic the server carries.

            </p>

            <p>

                The default of 0, e.g. no padding, was chosen for maximum backward

                compatibility. There might be deployments where padding bytes are

                unwanted or do harm. The most likely cause would be a client that

                has a faults implementation.

            </p>

        

</div>

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

<div class="directive-section"><h2><a name="H2Push" id="H2Push">H2Push</a> <a name="h2push" id="h2push">Directive</a> <a title="Permanent link" href="#h2push" class="permalink">&para;</a></h2>

docs/manual/mod/mod_mime.html.en

+40 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ 
<li><img alt="" src="../images/down.gif" /> <a href="#addoutputfilter">AddOutputFilter</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#addtype">AddType</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#defaultlanguage">DefaultLanguage</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#mimeoptions">MimeOptions</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#modmimeusepathinfo">ModMimeUsePathInfo</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#multiviewsmatch">MultiviewsMatch</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#removecharset">RemoveCharset</a></li>
@@ -660,6 +661,45 @@ assigned a language-tag by some other means.</td></tr> 
<ul>

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

</ul>

</div>

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

<div class="directive-section"><h2><a name="MimeOptions" id="MimeOptions">MimeOptions</a> <a name="mimeoptions" id="mimeoptions">Directive</a> <a title="Permanent link" href="#mimeoptions" class="permalink">&para;</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Configures mod_mime behavior</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>MimeOptions<var>option</var> [<var>option</var>] ...</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</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>Base</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_mime</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Apache HTTP Server 2.5.1 and later</td></tr>

</table>

    <p>The <code class="directive">MimeOptions</code> directive configures certain

    behaviors of <code class="module"><a href="../mod/mod_mime.html">mod_mime</a></code>. <var>Option</var> can

    be one of</p>



    <dl>

      <dt><code>TypesLastExtension</code></dt>

      <dd>This option only consider the last (right-most) filename extension

      when determining a files Content-Type.</dd>

      <dt><code>NoTypesLastExtension</code></dt>

      <dd>This option can be used to revert to the default behavior of testing

      every filename extension when determining a files Content-Type.</dd>

      <dt><code>AllLastExtension</code></dt>

      <dd>This option only consider the last (right-most) filename extension

      when scanning filenames.</dd>

      <dt><code>NoAllLastExtension</code></dt>

      <dd>This option can be used to revert to the default behavior of scanning 

      every filename extension. Only useful if 

      <code>MimeOptions AllLastExtension</code> has been used in a lower precedence 

      configuration section</dd>

      <dt><code>Disable</code></dt>

      <dd>All assignment of metadata based on the filename is skipped.</dd>

      <dt><code>Enable</code></dt>

      <dd>Re-enables file extension checking by this module. Only useful if a lower

      precedence configuration section has specified 

      <code>MimeOptions Disable</code>.</dd>

    </dl>



</div>

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

<div class="directive-section"><h2><a name="ModMimeUsePathInfo" id="ModMimeUsePathInfo">ModMimeUsePathInfo</a> <a name="modmimeusepathinfo" id="modmimeusepathinfo">Directive</a> <a title="Permanent link" href="#modmimeusepathinfo" class="permalink">&para;</a></h2>

docs/manual/mod/mod_proxy.html.en

+22 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
<li><img alt="" src="../images/down.gif" /> <a href="#balancerpersist">BalancerPersist</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#noproxy">NoProxy</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#proxy">&lt;Proxy&gt;</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#proxy100continue">Proxy100Continue</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#proxyaddheaders">ProxyAddHeaders</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#proxybadheader">ProxyBadHeader</a></li>

<li><img alt="" src="../images/down.gif" /> <a href="#proxyblock">ProxyBlock</a></li>
@@ -772,6 +773,27 @@ NoProxy .example.com 192.168.112.0/21</pre> 
<ul>

<li><code class="directive"><a href="#proxymatch">&lt;ProxyMatch&gt;</a></code></li>

</ul>

</div>

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

<div class="directive-section"><h2><a name="Proxy100Continue" id="Proxy100Continue">Proxy100Continue</a> <a name="proxy100continue" id="proxy100continue">Directive</a> <a title="Permanent link" href="#proxy100continue" class="permalink">&para;</a></h2>

<table class="directive">

<tr><th><a href="directive-dict.html#Description">Description:</a></th><td>Forward 100-continue expectation to the origin server</td></tr>

<tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>Proxy100Continue Off|On</code></td></tr>

<tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>Proxy100Continue On</code></td></tr>

<tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory</td></tr>

<tr><th><a href="directive-dict.html#Status">Status:</a></th><td>Extension</td></tr>

<tr><th><a href="directive-dict.html#Module">Module:</a></th><td>mod_proxy</td></tr>

<tr><th><a href="directive-dict.html#Compatibility">Compatibility:</a></th><td>Available in version 2.4.39 and later</td></tr>

</table>

    <p>This directive determines whether the proxy should forward 100-continue

    <em>Expect:</em>ation to the origin server and thus let it decide when/if

    the HTTP request body should be read, or when <code>Off</code> the proxy

    should generate <em>100 Continue</em> intermediate response by itself before

    forwarding the request body.</p>

    <div class="note"><h3>Effectiveness</h3>

     <p>This option is of use only for HTTP proxying, as handled by <code class="module"><a href="../mod/mod_proxy_http.html">mod_proxy_http</a></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="ProxyAddHeaders" id="ProxyAddHeaders">ProxyAddHeaders</a> <a name="proxyaddheaders" id="proxyaddheaders">Directive</a> <a title="Permanent link" href="#proxyaddheaders" class="permalink">&para;</a></h2>