details: http://freenginx.org/hg/nginx-site/rev/bf72b138d64e
branches:
changeset: 3100:bf72b138d64e
user: Maxim Dounin <mdou...@mdounin.ru>
date: Tue Apr 08 08:03:06 2025 +0300
description:
Documented "listen ... multipath".
diffstat:
xml/en/docs/http/ngx_http_core_module.xml | 13 ++++++++++++-
xml/en/docs/mail/ngx_mail_core_module.xml | 12 +++++++++++-
xml/en/docs/stream/ngx_stream_core_module.xml | 12 +++++++++++-
xml/ru/docs/http/ngx_http_core_module.xml | 13 ++++++++++++-
xml/ru/docs/mail/ngx_mail_core_module.xml | 12 +++++++++++-
xml/ru/docs/stream/ngx_stream_core_module.xml | 12 +++++++++++-
6 files changed, 68 insertions(+), 6 deletions(-)
diffs (232 lines):
diff --git a/xml/en/docs/http/ngx_http_core_module.xml
b/xml/en/docs/http/ngx_http_core_module.xml
--- 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="108">
+ rev="109">
<section id="directives" name="Directives">
@@ -1279,6 +1279,7 @@ The “wait-read-ignore” cycle is repeated, but no longer
than specified by the
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
[<literal>reuseport</literal>]
+ [<literal>multipath</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>
@@ -1297,6 +1298,7 @@ The “wait-read-ignore” cycle is repeated, but no longer
than specified by the
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
[<literal>reuseport</literal>]
+ [<literal>multipath</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>
@@ -1552,6 +1554,15 @@ Inappropriate use of this option may hav
</note>
</tag-desc>
+<tag-name id="multipath">
+<literal>multipath</literal>
+</tag-name>
+<tag-desc>
+instructs to use
+<link url="https://en.wikipedia.org/wiki/Multipath_TCP";>Multipath TCP</link>
+(the <c-def>IPPROTO_MPTCP</c-def> protocol) on Linux (1.27.5).
+</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>
diff --git a/xml/en/docs/mail/ngx_mail_core_module.xml
b/xml/en/docs/mail/ngx_mail_core_module.xml
--- a/xml/en/docs/mail/ngx_mail_core_module.xml
+++ b/xml/en/docs/mail/ngx_mail_core_module.xml
@@ -10,7 +10,7 @@
<module name="Module ngx_mail_core_module"
link="/en/docs/mail/ngx_mail_core_module.html"
lang="en"
- rev="23">
+ rev="24">
<section id="summary">
@@ -84,6 +84,7 @@ mail {
[<literal>sndbuf</literal>=<value>size</value>]
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
+ [<literal>multipath</literal>]
[<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax>
<default/>
<context>server</context>
@@ -200,6 +201,15 @@ This parameter is turned on by default.
It can only be set once on start.
</tag-desc>
+<tag-name id="multipath">
+<literal>multipath</literal>
+</tag-name>
+<tag-desc>
+instructs to use
+<link url="https://en.wikipedia.org/wiki/Multipath_TCP";>Multipath TCP</link>
+(the <c-def>IPPROTO_MPTCP</c-def> protocol) on Linux (1.27.5).
+</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>
diff --git a/xml/en/docs/stream/ngx_stream_core_module.xml
b/xml/en/docs/stream/ngx_stream_core_module.xml
--- a/xml/en/docs/stream/ngx_stream_core_module.xml
+++ b/xml/en/docs/stream/ngx_stream_core_module.xml
@@ -9,7 +9,7 @@
<module name="Module ngx_stream_core_module"
link="/en/docs/stream/ngx_stream_core_module.html"
lang="en"
- rev="38">
+ rev="39">
<section id="summary">
@@ -89,6 +89,7 @@ stream {
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
[<literal>reuseport</literal>]
+ [<literal>multipath</literal>]
[<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax>
<default/>
<context>server</context>
@@ -251,6 +252,15 @@ Inappropriate use of this option may hav
</note>
</tag-desc>
+<tag-name id="multipath">
+<literal>multipath</literal>
+</tag-name>
+<tag-desc>
+instructs to use
+<link url="https://en.wikipedia.org/wiki/Multipath_TCP";>Multipath TCP</link>
+(the <c-def>IPPROTO_MPTCP</c-def> protocol) on Linux (1.27.5).
+</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>
diff --git a/xml/ru/docs/http/ngx_http_core_module.xml
b/xml/ru/docs/http/ngx_http_core_module.xml
--- a/xml/ru/docs/http/ngx_http_core_module.xml
+++ b/xml/ru/docs/http/ngx_http_core_module.xml
@@ -10,7 +10,7 @@
<module name="Модуль ngx_http_core_module"
link="/ru/docs/http/ngx_http_core_module.html"
lang="ru"
- rev="108">
+ rev="109">
<section id="directives" name="Директивы">
@@ -1273,6 +1273,7 @@ location /flv/ {
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
[<literal>reuseport</literal>]
+ [<literal>multipath</literal>]
[<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax>
<syntax>
<value>порт</value>
@@ -1291,6 +1292,7 @@ location /flv/ {
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
[<literal>reuseport</literal>]
+ [<literal>multipath</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>путь</value>
@@ -1544,6 +1546,15 @@ FreeBSD, DragonFly BSD и macOS, и 511 для других
платформ.
</note>
</tag-desc>
+<tag-name id="multipath">
+<literal>multipath</literal>
+</tag-name>
+<tag-desc>
+указывает использовать
+<link url="https://en.wikipedia.org/wiki/Multipath_TCP";>Multipath TCP</link>
+(протокол <c-def>IPPROTO_MPTCP</c-def>) на Linux (1.27.5).
+</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>
diff --git a/xml/ru/docs/mail/ngx_mail_core_module.xml
b/xml/ru/docs/mail/ngx_mail_core_module.xml
--- a/xml/ru/docs/mail/ngx_mail_core_module.xml
+++ b/xml/ru/docs/mail/ngx_mail_core_module.xml
@@ -10,7 +10,7 @@
<module name="Модуль ngx_mail_core_module"
link="/ru/docs/mail/ngx_mail_core_module.html"
lang="ru"
- rev="23">
+ rev="24">
<section id="summary">
@@ -84,6 +84,7 @@ mail {
[<literal>sndbuf</literal>=<value>размер</value>]
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
+ [<literal>multipath</literal>]
[<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax>
<default/>
<context>server</context>
@@ -201,6 +202,15 @@ FreeBSD, DragonFly BSD и macOS, и 511 для других платформ.
Установить его можно только один раз на старте.
</tag-desc>
+<tag-name id="multipath">
+<literal>multipath</literal>
+</tag-name>
+<tag-desc>
+указывает использовать
+<link url="https://en.wikipedia.org/wiki/Multipath_TCP";>Multipath TCP</link>
+(протокол <c-def>IPPROTO_MPTCP</c-def>) на Linux (1.27.5).
+</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>
diff --git a/xml/ru/docs/stream/ngx_stream_core_module.xml
b/xml/ru/docs/stream/ngx_stream_core_module.xml
--- a/xml/ru/docs/stream/ngx_stream_core_module.xml
+++ b/xml/ru/docs/stream/ngx_stream_core_module.xml
@@ -9,7 +9,7 @@
<module name="Модуль ngx_stream_core_module"
link="/ru/docs/stream/ngx_stream_core_module.html"
lang="ru"
- rev="38">
+ rev="39">
<section id="summary">
@@ -89,6 +89,7 @@ stream {
[<literal>bind</literal>]
[<literal>ipv6only</literal>=<literal>on</literal>|<literal>off</literal>]
[<literal>reuseport</literal>]
+ [<literal>multipath</literal>]
[<literal>so_keepalive</literal>=<literal>on</literal>|<literal>off</literal>|[<value>keepidle</value>]:[<value>keepintvl</value>]:[<value>keepcnt</value>]]</syntax>
<default/>
<context>server</context>
@@ -235,6 +236,15 @@ FreeBSD, DragonFly BSD и macOS,
Установить его можно только один раз на старте.
</tag-desc>
+<tag-name id="multipath">
+<literal>multipath</literal>
+</tag-name>
+<tag-desc>
+указывает использовать
+<link url="https://en.wikipedia.org/wiki/Multipath_TCP";>Multipath TCP</link>
+(протокол <c-def>IPPROTO_MPTCP</c-def>) на Linux (1.27.5).
+</tag-desc>
+
<tag-name id="reuseport">
<literal>reuseport</literal>
</tag-name>
