Mercurial > hg > nginx-site

changeset 1525:e47758a54759

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated the "WebSockets Proxying" article with proxy_read_timeout.
author Yaroslav Zhuravlev <yar@nginx.com>
date Wed, 01 Jul 2015 15:54:32 +0300
parents 323b0d071166
children 7b15698cbdb7
files xml/en/docs/http/websocket.xml xml/ru/docs/http/websocket.xml
diffstat 2 files changed, 34 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/xml/en/docs/http/websocket.xml
+++ b/xml/en/docs/http/websocket.xml
@@ -7,7 +7,7 @@
 <article name="WebSocket proxying"
          link="/en/docs/http/websocket.html"
          lang="en"
-         rev="1">
+         rev="2">
 
 
 <section>
@@ -77,6 +77,22 @@ http {
 </programlisting>
 </para>
 
+<para>
+By default, the connection will be closed
+if no data is transmitted within 60 seconds.
+The <link doc="ngx_http_proxy_module.xml" id="proxy_read_timeout"/> and
+<link doc="ngx_http_proxy_module.xml" id="proxy_send_timeout"/> directives
+allow overriding this value:
+<programlisting>
+location /chat/ {
+    ...
+
+    proxy_read_timeout 10m;
+    proxy_send_timeout 10m;
+}
+</programlisting>
+</para>
+
 </section>
 
 </article>
--- a/xml/ru/docs/http/websocket.xml
+++ b/xml/ru/docs/http/websocket.xml
@@ -7,7 +7,7 @@
 <article name="Проксирование WebSocket"
          link="/ru/docs/http/websocket.html"
          lang="ru"
-         rev="1">
+         rev="2">
 
 
 <section>
@@ -78,6 +78,22 @@ http {
 </programlisting>
 </para>
 
+<para>
+По умолчанию соединение будет закрыто,
+если данные не передавались в течение 60 секунд.
+Директивы <link doc="ngx_http_proxy_module.xml" id="proxy_read_timeout"/> и
+<link doc="ngx_http_proxy_module.xml" id="proxy_send_timeout"/>
+позволяют переопределить это значение:
+<programlisting>
+location /chat/ {
+    ...
+
+    proxy_read_timeout 10m;
+    proxy_send_timeout 10m;
+}
+</programlisting>
+</para>
+
 </section>
 
 </article>