diff options
author | Mike Rumph <mrumph@apache.org> | 2015-12-07 16:37:24 +0000 |
---|---|---|
committer | Mike Rumph <mrumph@apache.org> | 2015-12-07 16:37:24 +0000 |
commit | 31acd55b58926343b91fabd9252b815ae5f9ae5e (patch) | |
tree | ff277a282ab12e0d256de6984e9848bb29725f26 | |
parent | 9e21273b5726176fa3eba33301a56108694060e0 (diff) | |
download | httpd-31acd55b58926343b91fabd9252b815ae5f9ae5e.tar.gz |
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1718422 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | docs/manual/mod/mod_http2.html.en | 10 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.html.en | 5 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.ja | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy.xml.meta | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_fdpass.html.en | 11 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_fdpass.xml.fr | 2 | ||||
-rw-r--r-- | docs/manual/mod/mod_proxy_fdpass.xml.meta | 2 |
8 files changed, 23 insertions, 13 deletions
diff --git a/docs/manual/mod/mod_http2.html.en b/docs/manual/mod/mod_http2.html.en index 57ad5cba3d..c3c6d18d4d 100644 --- a/docs/manual/mod/mod_http2.html.en +++ b/docs/manual/mod/mod_http2.html.en @@ -386,14 +386,14 @@ get double the weight of X. With 128 only half as much. Note that effective weights are always capped at 256. </p> - <div class="example"><h3>Before Priority Rule</h3><pre class="prettyprint lang-config">H2PushPriority application/json Before 256</pre> + <div class="example"><h3>Before Priority Rule</h3><pre class="prettyprint lang-config">H2PushPriority application/json Before</pre> </div> <p> This says that any pushed stream of content type 'application/json' should be send out <em>before</em> X. This makes P1 dependent on Y and X dependent on P1. So, X will be stalled as long as - P1 has data to send. The effective weight is calculated as - in the interleaved case. + P1 has data to send. The effective weight is inherited from the + client stream. Specifying a weight is not allowed. </p> <p> Be aware that the effect of priority specifications is limited @@ -409,11 +409,11 @@ <li>'*' is the only special content-type that matches all others. 'image/*' will not work.</li> <li>The default dependency is 'After'. </li> - <li>There are also default weights: for 'After' it is 16, otherwise 256. + <li>There are also default weights: for 'After' it is 16, 'interleaved' is 256. </li> </ol> <div class="example"><h3>Shorter Priority Rules</h3><pre class="prettyprint lang-config">H2PushPriority application/json 32 # an After rule -H2PushPriority image/jpeg before # weight 256 default +H2PushPriority image/jpeg before # weight inherited H2PushPriority text/css interleaved # weight 256 default</pre> </div> diff --git a/docs/manual/mod/mod_proxy.html.en b/docs/manual/mod/mod_proxy.html.en index 5ce4af608f..b83fdf6557 100644 --- a/docs/manual/mod/mod_proxy.html.en +++ b/docs/manual/mod/mod_proxy.html.en @@ -1270,6 +1270,11 @@ ProxyPass "/mirror/foo" "http://backend.example.com"</pre> connection will not be used again; it will be closed at some later time. </td></tr> + <tr><td>flusher</td> + <td>flush</td> + <td><p>Name of the provider used by <code class="module"><a href="../mod/mod_proxy_fdpass.html">mod_proxy_fdpass</a></code>. + See the documentation of this module for more details.</p> + </td></tr> </table> diff --git a/docs/manual/mod/mod_proxy.xml.fr b/docs/manual/mod/mod_proxy.xml.fr index c77096badb..44758a20d8 100644 --- a/docs/manual/mod/mod_proxy.xml.fr +++ b/docs/manual/mod/mod_proxy.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision: 1705682 --> +<!-- English Revision: 1705682:1718324 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_proxy.xml.ja b/docs/manual/mod/mod_proxy.xml.ja index fb3bcdf4c6..92948d26c3 100644 --- a/docs/manual/mod/mod_proxy.xml.ja +++ b/docs/manual/mod/mod_proxy.xml.ja @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.ja.xsl"?> -<!-- English Revision: 344971:1705682 (outdated) --> +<!-- English Revision: 344971:1718324 (outdated) --> <!-- Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/docs/manual/mod/mod_proxy.xml.meta b/docs/manual/mod/mod_proxy.xml.meta index 38a79fdda7..f0185375d4 100644 --- a/docs/manual/mod/mod_proxy.xml.meta +++ b/docs/manual/mod/mod_proxy.xml.meta @@ -8,7 +8,7 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> <variant outdated="yes">ja</variant> </variants> </metafile> diff --git a/docs/manual/mod/mod_proxy_fdpass.html.en b/docs/manual/mod/mod_proxy_fdpass.html.en index 6d7610c683..bbc5f4f653 100644 --- a/docs/manual/mod/mod_proxy_fdpass.html.en +++ b/docs/manual/mod/mod_proxy_fdpass.html.en @@ -47,9 +47,14 @@ <p>The module has a <code>proxy_fdpass_flusher</code> provider interface, which allows another module to optionally send the response headers, or even - the start of the response body. The default flush provider disables keep-alive, - and sends the response headers, letting the external process just send a - response body.</p> + the start of the response body. The default <code>flush</code> provider + disables keep-alive, and sends the response headers, letting the external + process just send a response body. + </p> + + <p>In order to use another provider, you have to set the <code>flusher</code> + parameter in the <code class="directive"><a href="../mod/mod_proxy.html#proxypass">ProxyPass</a></code> directive. + </p> <p>At this time the only data passed to the external process is the client socket. To receive a client socket, call recvfrom with an allocated diff --git a/docs/manual/mod/mod_proxy_fdpass.xml.fr b/docs/manual/mod/mod_proxy_fdpass.xml.fr index 715ff1f973..8e1c18d4bc 100644 --- a/docs/manual/mod/mod_proxy_fdpass.xml.fr +++ b/docs/manual/mod/mod_proxy_fdpass.xml.fr @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE modulesynopsis SYSTEM "../style/modulesynopsis.dtd"> <?xml-stylesheet type="text/xsl" href="../style/manual.fr.xsl"?> -<!-- English Revision : 1174747 --> +<!-- English Revision: 1174747:1718324 (outdated) --> <!-- French translation : Lucien GENTIS --> <!-- Reviewed by : Vincent Deffontaines --> diff --git a/docs/manual/mod/mod_proxy_fdpass.xml.meta b/docs/manual/mod/mod_proxy_fdpass.xml.meta index a99a7942b5..12cdbd444e 100644 --- a/docs/manual/mod/mod_proxy_fdpass.xml.meta +++ b/docs/manual/mod/mod_proxy_fdpass.xml.meta @@ -8,6 +8,6 @@ <variants> <variant>en</variant> - <variant>fr</variant> + <variant outdated="yes">fr</variant> </variants> </metafile> |