Mercurial > hg > nginx-site
diff xml/en/docs/http/ngx_http_core_module.xml @ 869:ade81792bdaa
Documented SPDY support.
New SPDY module added and the "listen" directive description is updated.
author | Homutov Vladimir <vl@nginx.com> |
---|---|
date | Wed, 20 Mar 2013 15:00:06 +0400 |
parents | 9dab69f2b71d |
children | 96839d165b8a |
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml +++ b/xml/en/docs/http/ngx_http_core_module.xml @@ -10,7 +10,7 @@ <module name="Module ngx_http_core_module" link="/en/docs/http/ngx_http_core_module.html" lang="en" - rev="17"> + rev="18"> <section id="directives" name="Directives"> @@ -1102,6 +1102,8 @@ The “wait-read-ignore” cycle is repeated, but no longer than specified by the <syntax> <value>address</value>[:<value>port</value>] [<literal>default_server</literal>] + [<literal>ssl</literal>] + [<literal>spdy</literal>] [<literal>setfib</literal>=<value>number</value>] [<literal>backlog</literal>=<value>number</value>] [<literal>rcvbuf</literal>=<value>size</value>] @@ -1110,11 +1112,12 @@ The “wait-read-ignore” cycle is repeated, but no longer than specified by the [<literal>deferred</literal>] [<literal>bind</literal>] [<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>] - [<literal>ssl</literal>] [<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax> <syntax> <value>port</value> [<literal>default_server</literal>] + [<literal>ssl</literal>] + [<literal>spdy</literal>] [<literal>setfib</literal>=<value>number</value>] [<literal>backlog</literal>=<value>number</value>] [<literal>rcvbuf</literal>=<value>size</value>] @@ -1123,18 +1126,18 @@ The “wait-read-ignore” cycle is repeated, but no longer than specified by the [<literal>deferred</literal>] [<literal>bind</literal>] [<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>] - [<literal>ssl</literal>] [<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax> <syntax> <literal>unix:</literal><value>path</value> [<literal>default_server</literal>] + [<literal>ssl</literal>] + [<literal>spdy</literal>] [<literal>backlog</literal>=<value>number</value>] [<literal>rcvbuf</literal>=<value>size</value>] [<literal>sndbuf</literal>=<value>size</value>] [<literal>accept_filter</literal>=<value>filter</value>] [<literal>deferred</literal>] [<literal>bind</literal>] - [<literal>ssl</literal>] [<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax> <default>*:80 | *:8000</default> <context>server</context> @@ -1189,6 +1192,22 @@ In versions prior to 0.8.21 this paramet </para> <para> +The <literal>ssl</literal> parameter (0.7.14) allows to specify that all +connections accepted on this port should work in SSL mode. +This allows for a more compact <link doc="configuring_https_servers.xml" +id="single_http_https_server">configuration</link> for the server that +handles both HTTP and HTTPS requests. +</para> + +<para> +The <literal>spdy</literal> parameter (1.3.15) allows to accept +<link doc="ngx_http_spdy_module.xml">SPDY</link> connections on this port. +Normally, for this to work the <literal>ssl</literal> parameter should be +specified as well, but nginx can also be configured to accept SPDY +connections without SSL. +</para> + +<para> A <literal>listen</literal> directive can have several additional parameters specific to socket-related system calls. They can be specified in any @@ -1301,18 +1320,6 @@ in effect for the socket. </tag-desc> <tag-name> -<literal>ssl</literal> -</tag-name> -<tag-desc> -this parameter (0.7.14) does not relate to socket-related system calls, -but allows to specify that all connections accepted on this port -should work in SSL mode. -This allows for a more compact <link doc="configuring_https_servers.xml" -id="single_http_https_server">configuration</link> for the server that -handles both HTTP and HTTPS requests. -</tag-desc> - -<tag-name> <literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>] </tag-name> <tag-desc>