From 31acd55b58926343b91fabd9252b815ae5f9ae5e Mon Sep 17 00:00:00 2001 From: Mike Rumph Date: Mon, 7 Dec 2015 16:37:24 +0000 Subject: [PATCH] Generated doc changes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1718422 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_http2.html.en | 10 +++++----- docs/manual/mod/mod_proxy.html.en | 5 +++++ docs/manual/mod/mod_proxy.xml.fr | 2 +- docs/manual/mod/mod_proxy.xml.ja | 2 +- docs/manual/mod/mod_proxy.xml.meta | 2 +- docs/manual/mod/mod_proxy_fdpass.html.en | 11 ++++++++--- docs/manual/mod/mod_proxy_fdpass.xml.fr | 2 +- 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.

-

Before Priority Rule

H2PushPriority application/json Before 256
+

Before Priority Rule

H2PushPriority application/json Before

This says that any pushed stream of content type 'application/json' should be send out before 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.

Be aware that the effect of priority specifications is limited @@ -409,11 +409,11 @@

  • '*' is the only special content-type that matches all others. 'image/*' will not work.
  • The default dependency is 'After'.
    • -
  • There are also default weights: for 'After' it is 16, otherwise 256. +
  • There are also default weights: for 'After' it is 16, 'interleaved' is 256.

    • Shorter Priority Rules

    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
    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" connection will not be used again; it will be closed at some later time. + flusher + flush +

    Name of the provider used by mod_proxy_fdpass. + See the documentation of this module for more details.

    + 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 @@ - + 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 @@ - + + 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 @@ en - fr + fr -- 2.40.0