diff xml/en/docs/http/ngx_http_core_module.xml @ 1031:f7f23f5928ef

Documented "resolver ipv6=" parameter.
author Ruslan Ermilov <ru@nginx.com>
date Fri, 13 Dec 2013 21:02:08 +0400
parents e47971bf6619
children e9c485d6cc0c
line wrap: on
line diff
--- a/xml/en/docs/http/ngx_http_core_module.xml	Fri Dec 13 17:39:12 2013 +0400
+++ b/xml/en/docs/http/ngx_http_core_module.xml	Fri Dec 13 21:02:08 2013 +0400
@@ -10,7 +10,7 @@
 <module name="Module ngx_http_core_module"
         link="/en/docs/http/ngx_http_core_module.html"
         lang="en"
-        rev="25">
+        rev="26">
 
 <section id="directives" name="Directives">
 
@@ -1956,8 +1956,9 @@
 
 <directive name="resolver">
 <syntax>
-<value>address</value> ...
-[<literal>valid</literal>=<value>time</value>]</syntax>
+    <value>address</value> ...
+    [<literal>valid</literal>=<value>time</value>]
+    [<literal>ipv6</literal>=<literal>on</literal>|<literal>off</literal>]</syntax>
 <default/>
 <context>http</context>
 <context>server</context>
@@ -1978,6 +1979,13 @@
 Specifying name servers using IPv6 addresses is supported
 starting from versions 1.3.1 and 1.2.2.
 </note>
+By default, nginx will look up both IPv4 and IPv6 addresses while resolving.
+If looking up of IPv6 addresses is not desired,
+the <literal>ipv6=off</literal> parameter can be specified.
+<note>
+Resolving of names into IPv6 addresses is supported
+starting from version 1.5.8.
+</note>
 By default, nginx caches answers using the TTL value of a response.
 An optional <literal>valid</literal> parameter allows overriding it:
 <example>