From: Luca Toscano Date: Fri, 20 Jan 2017 08:46:55 +0000 (+0000) Subject: Documentation rebuild X-Git-Tag: 2.5.0-alpha~771 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe4289b510923271d3817afa9f1630e6cda19410;p=thirdparty%2Fapache%2Fhttpd.git Documentation rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779579 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_proxy_http2.html.en b/docs/manual/mod/mod_proxy_http2.html.en index aa3a1bcab86..4beb2f5d406 100644 --- a/docs/manual/mod/mod_proxy_http2.html.en +++ b/docs/manual/mod/mod_proxy_http2.html.en @@ -45,9 +45,14 @@ have to be present in the server.

mod_proxy_http2 works with incoming requests - over HTTP/1.1 and HTTP/2 requests. If mod_http2 - handles the frontend connection, requests against the same HTTP/2 - backend are sent over a single connection, whenever possible.

+ over HTTP/1.1 and HTTP/2 requests. In both cases, requests proxied + to the same backend are sent over a single connection + whenever possible (namely when the connection can be re-used).

+ +

mod_proxy_http2 will not use the HTTP/2 protocol + when the frontend requests use HTTP/1.1. + This means that HTTP/2 will be used to proxy requests to a capable backend + only when the frontend requests use the same protocol.

This module relies on libnghttp2 to provide the core http/2 engine.

diff --git a/docs/manual/programs/httpd.html.en b/docs/manual/programs/httpd.html.en index 98825f23c63..e2338995f08 100644 --- a/docs/manual/programs/httpd.html.en +++ b/docs/manual/programs/httpd.html.en @@ -51,7 +51,7 @@ [ -e level ] [ -E file ] [ -k start|restart|graceful|stop|graceful-stop ] - [ -R directory ] [ -h ] + [ -h ] [ -l ] [ -L ] [ -S ] [ -t ] [ -v ] [ -V ] [ -X ] [ -M ] [ -T ] diff --git a/docs/manual/programs/httpd.xml.ko b/docs/manual/programs/httpd.xml.ko index 5a73a287a68..835df31591e 100644 --- a/docs/manual/programs/httpd.xml.ko +++ b/docs/manual/programs/httpd.xml.ko @@ -1,7 +1,7 @@ - + +