Mercurial > hg > nginx-site
diff xml/en/docs/http/ngx_http_core_module.xml @ 1561:ed420c318557
Updated docs for the upcoming NGINX Plus release.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 10 Sep 2015 15:50:32 +0300 |
parents | 88d1a1d36c0c |
children | 695999bdd4a5 |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml Tue Sep 08 09:38:31 2015 +0300 +++ b/xml/en/docs/http/ngx_http_core_module.xml Thu Sep 10 15:50:32 2015 +0300 @@ -10,7 +10,7 @@ <module name="Module ngx_http_core_module" link="/en/docs/http/ngx_http_core_module.html" lang="en" - rev="45"> + rev="46"> <section id="directives" name="Directives"> @@ -1118,7 +1118,7 @@ <value>address</value>[:<value>port</value>] [<literal>default_server</literal>] [<literal>ssl</literal>] - [<literal>spdy</literal>] + [<literal>spdy</literal> | <literal>http2</literal>] [<literal>proxy_protocol</literal>] [<literal>setfib</literal>=<value>number</value>] [<literal>fastopen</literal>=<value>number</value>] @@ -1135,7 +1135,7 @@ <value>port</value> [<literal>default_server</literal>] [<literal>ssl</literal>] - [<literal>spdy</literal>] + [<literal>spdy</literal> | <literal>http2</literal>] [<literal>proxy_protocol</literal>] [<literal>setfib</literal>=<value>number</value>] [<literal>fastopen</literal>=<value>number</value>] @@ -1152,7 +1152,7 @@ <literal>unix:</literal><value>path</value> [<literal>default_server</literal>] [<literal>ssl</literal>] - [<literal>spdy</literal>] + [<literal>spdy</literal> | <literal>http2</literal>] [<literal>proxy_protocol</literal>] [<literal>backlog</literal>=<value>number</value>] [<literal>rcvbuf</literal>=<value>size</value>] @@ -1231,6 +1231,20 @@ </para> <para> +The <literal>http2</literal> parameter configures the port to accept +HTTP/2 connections. +Normally, for this to work the <literal>ssl</literal> parameter should be +specified as well, but nginx can also be configured to accept HTTP/2 +connections without SSL. +<note> +The <literal>http2</literal> parameter is only available in the +<literal>nginx-plus-http2</literal> package (NGINX Plus release 7). +Since HTTP/2 supersedes SPDY, the <literal>nginx-plus-http2</literal> +package does not support the <literal>spdy</literal> parameter. +</note> +</para> + +<para> The <literal>proxy_protocol</literal> parameter (1.5.12) allows specifying that all connections accepted on this port should use the <link url="http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt">PROXY