Skip to content

Commit 49afe8a

Browse files
y82y82
committed
Documented "resolver" and "reslover_timeout" for upstream.
1 parent 4125af7 commit 49afe8a

File tree

4 files changed

+40
-24
lines changed

4 files changed

+40
-24
lines changed

‎xml/en/docs/http/ngx_http_upstream_module.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Module ngx_http_upstream_module"
1111
link="/en/docs/http/ngx_http_upstream_module.html"
1212
lang="en"
13-
rev="88">
13+
rev="89">
1414

1515
<section id="summary">
1616

@@ -905,7 +905,7 @@ The <literal>least_time</literal> method is available as a part of our
905905
[<literal>status_zone</literal>=<value>zone</value>]</syntax>
906906
<default/>
907907
<context>upstream</context>
908-
<appeared-in>1.17.5</appeared-in>
908+
<appeared-in>1.27.3</appeared-in>
909909

910910
<para>
911911
Configures name servers used to resolve names of upstream servers
@@ -939,16 +939,19 @@ configuring DNS servers in a properly secured trusted local network.
939939
</para>
940940

941941
<para id="resolver_status_zone">
942-
The optional <literal>status_zone</literal> parameter
942+
The optional <literal>status_zone</literal> parameter (1.17.5)
943943
enables
944944
<link doc="ngx_http_api_module.xml" id="resolvers_">collection</link>
945945
of DNS server statistics of requests and responses
946946
in the specified <value>zone</value>.
947+
The parameter is available as part of our
948+
<commercial_version>commercial subscription</commercial_version>.
947949
</para>
948950

949951
<para>
950952
<note>
951-
This directive is available as part of our
953+
Since version 1.17.5 and prior to version 1.27.3,
954+
this directive was available only as part of our
952955
<commercial_version>commercial subscription</commercial_version>.
953956
</note>
954957
</para>
@@ -960,7 +963,7 @@ This directive is available as part of our
960963
<syntax><value>time</value></syntax>
961964
<default>30s</default>
962965
<context>upstream</context>
963-
<appeared-in>1.17.5</appeared-in>
966+
<appeared-in>1.27.3</appeared-in>
964967

965968
<para>
966969
Sets a timeout for name resolution, for example:
@@ -971,7 +974,8 @@ resolver_timeout 5s;
971974

972975
<para>
973976
<note>
974-
This directive is available as part of our
977+
Since version 1.17.5 and prior to version 1.27.3,
978+
this directive was available only as part of our
975979
<commercial_version>commercial subscription</commercial_version>.
976980
</note>
977981
</para>

‎xml/en/docs/stream/ngx_stream_upstream_module.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<module name="Module ngx_stream_upstream_module"
1010
link="/en/docs/stream/ngx_stream_upstream_module.html"
1111
lang="en"
12-
rev="39">
12+
rev="40">
1313

1414
<section id="summary">
1515

@@ -548,7 +548,7 @@ The <literal>least_time</literal> method is available as a part of our
548548
[<literal>status_zone</literal>=<value>zone</value>]</syntax>
549549
<default/>
550550
<context>upstream</context>
551-
<appeared-in>1.17.5</appeared-in>
551+
<appeared-in>1.27.3</appeared-in>
552552

553553
<para>
554554
Configures name servers used to resolve names of upstream servers
@@ -582,16 +582,19 @@ configuring DNS servers in a properly secured trusted local network.
582582
</para>
583583

584584
<para id="resolver_status_zone">
585-
The optional <literal>status_zone</literal> parameter
585+
The optional <literal>status_zone</literal> parameter (1.17.5)
586586
enables
587587
<link doc="../http/ngx_http_api_module.xml" id="resolvers_">collection</link>
588588
of DNS server statistics of requests and responses
589589
in the specified <value>zone</value>.
590+
The parameter is available as part of our
591+
<commercial_version>commercial subscription</commercial_version>.
590592
</para>
591593

592594
<para>
593595
<note>
594-
This directive is available as part of our
596+
Since version 1.17.5 and prior to version 1.27.3,
597+
this directive was available only as part of our
595598
<commercial_version>commercial subscription</commercial_version>.
596599
</note>
597600
</para>
@@ -603,7 +606,7 @@ This directive is available as part of our
603606
<syntax><value>time</value></syntax>
604607
<default>30s</default>
605608
<context>upstream</context>
606-
<appeared-in>1.17.5</appeared-in>
609+
<appeared-in>1.27.3</appeared-in>
607610

608611
<para>
609612
Sets a timeout for name resolution, for example:
@@ -614,7 +617,8 @@ resolver_timeout 5s;
614617

615618
<para>
616619
<note>
617-
This directive is available as part of our
620+
Since version 1.17.5 and prior to version 1.27.3,
621+
this directive was available only as part of our
618622
<commercial_version>commercial subscription</commercial_version>.
619623
</note>
620624
</para>

‎xml/ru/docs/http/ngx_http_upstream_module.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<module name="Модуль ngx_http_upstream_module"
1111
link="/ru/docs/http/ngx_http_upstream_module.html"
1212
lang="ru"
13-
rev="88">
13+
rev="89">
1414

1515
<section id="summary">
1616

@@ -913,7 +913,7 @@ server {
913913
[<literal>status_zone</literal>=<value>зона</value>]</syntax>
914914
<default/>
915915
<context>upstream</context>
916-
<appeared-in>1.17.5</appeared-in>
916+
<appeared-in>1.27.3</appeared-in>
917917

918918
<para>
919919
Задаёт серверы DNS, используемые для преобразования имён вышестоящих серверов
@@ -949,16 +949,19 @@ resolver 127.0.0.1 [::1]:5353 valid=30s;
949949
</para>
950950

951951
<para id="resolver_status_zone">
952-
Необязательный параметр <literal>status_zone</literal>
952+
Необязательный параметр <literal>status_zone</literal> (1.17.5)
953953
включает
954954
<link doc="ngx_http_api_module.xml" id="resolvers_">сбор информации</link>
955955
о запросах и ответах сервера DNS
956956
в указанной <value>зоне</value>.
957+
Параметр доступен как часть
958+
<commercial_version>коммерческой подписки</commercial_version>.
957959
</para>
958960

959961
<para>
960962
<note>
961-
Эта директива доступна как часть
963+
Начиная с версии 1.17.5 и до версии 1.27.3
964+
эта директива была доступна только как часть
962965
<commercial_version>коммерческой подписки</commercial_version>.
963966
</note>
964967
</para>
@@ -970,7 +973,7 @@ resolver 127.0.0.1 [::1]:5353 valid=30s;
970973
<syntax><value>время</value></syntax>
971974
<default>30s</default>
972975
<context>upstream</context>
973-
<appeared-in>1.17.5</appeared-in>
976+
<appeared-in>1.27.3</appeared-in>
974977

975978
<para>
976979
Задаёт таймаут для преобразования имени в адрес, например:
@@ -981,7 +984,8 @@ resolver_timeout 5s;
981984

982985
<para>
983986
<note>
984-
Эта директива доступна как часть
987+
Начиная с версии 1.17.5 и до версии 1.27.3
988+
эта директива была доступна только как часть
985989
<commercial_version>коммерческой подписки</commercial_version>.
986990
</note>
987991
</para>

‎xml/ru/docs/stream/ngx_stream_upstream_module.xml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<module name="Модуль ngx_stream_upstream_module"
1010
link="/ru/docs/stream/ngx_stream_upstream_module.html"
1111
lang="ru"
12-
rev="39">
12+
rev="40">
1313

1414
<section id="summary">
1515

@@ -549,7 +549,7 @@ hash $remote_addr;
549549
[<literal>status_zone</literal>=<value>зона</value>]</syntax>
550550
<default/>
551551
<context>upstream</context>
552-
<appeared-in>1.17.5</appeared-in>
552+
<appeared-in>1.27.3</appeared-in>
553553

554554
<para>
555555
Задаёт серверы DNS, используемые для преобразования имён вышестоящих серверов
@@ -585,16 +585,19 @@ resolver 127.0.0.1 [::1]:5353 valid=30s;
585585
</para>
586586

587587
<para id="resolver_status_zone">
588-
Необязательный параметр <literal>status_zone</literal>
588+
Необязательный параметр <literal>status_zone</literal> (1.17.5)
589589
включает
590590
<link doc="../http/ngx_http_api_module.xml" id="resolvers_">сбор информации</link>
591591
о запросах и ответах сервера DNS
592592
в указанной <value>зоне</value>.
593+
Параметр доступен как часть
594+
<commercial_version>коммерческой подписки</commercial_version>.
593595
</para>
594596

595597
<para>
596598
<note>
597-
Эта директива доступна как часть
599+
Начиная с версии 1.17.5 и до версии 1.27.3
600+
эта директива была доступна только как часть
598601
<commercial_version>коммерческой подписки</commercial_version>.
599602
</note>
600603
</para>
@@ -606,7 +609,7 @@ resolver 127.0.0.1 [::1]:5353 valid=30s;
606609
<syntax><value>время</value></syntax>
607610
<default>30s</default>
608611
<context>upstream</context>
609-
<appeared-in>1.17.5</appeared-in>
612+
<appeared-in>1.27.3</appeared-in>
610613

611614
<para>
612615
Задаёт таймаут для преобразования имени в адрес, например:
@@ -617,7 +620,8 @@ resolver_timeout 5s;
617620

618621
<para>
619622
<note>
620-
Эта директива доступна как часть
623+
Начиная с версии 1.17.5 и до версии 1.27.3
624+
эта директива была доступна только как часть
621625
<commercial_version>коммерческой подписки</commercial_version>.
622626
</note>
623627
</para>

0 commit comments

Comments
 (0)