You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mr...@apache.org on 2015/12/07 17:37:24 UTC
svn commit: r1718422 - in /httpd/httpd/branches/2.4.x/docs/manual/mod:
mod_http2.html.en mod_proxy.html.en mod_proxy.xml.fr mod_proxy.xml.ja
mod_proxy.xml.meta mod_proxy_fdpass.html.en mod_proxy_fdpass.xml.fr
mod_proxy_fdpass.xml.meta
Author: mrumph
Date: Mon Dec 7 16:37:24 2015
New Revision: 1718422
URL: http://svn.apache.org/viewvc?rev=1718422&view=rev
Log:
Generated doc changes
Modified:
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_http2.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.html.en
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.fr
httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.meta
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_http2.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_http2.html.en?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_http2.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_http2.html.en Mon Dec 7 16:37:24 2015
@@ -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>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.html.en Mon Dec 7 16:37:24 2015
@@ -1270,6 +1270,11 @@ ProxyPass "/mirror/foo" "http://backend.
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>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.fr Mon Dec 7 16:37:24 2015
@@ -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 -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.ja [utf-8] Mon Dec 7 16:37:24 2015
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy.xml.meta Mon Dec 7 16:37:24 2015
@@ -8,7 +8,7 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
<variant outdated="yes">ja</variant>
</variants>
</metafile>
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.html.en?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.html.en (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.html.en Mon Dec 7 16:37:24 2015
@@ -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
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.fr
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.fr?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.fr (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.fr Mon Dec 7 16:37:24 2015
@@ -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 -->
Modified: httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.meta
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.meta?rev=1718422&r1=1718421&r2=1718422&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.meta (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/mod/mod_proxy_fdpass.xml.meta Mon Dec 7 16:37:24 2015
@@ -8,6 +8,6 @@
<variants>
<variant>en</variant>
- <variant>fr</variant>
+ <variant outdated="yes">fr</variant>
</variants>
</metafile>