new file mode 100644
--- /dev/null
+++ b/http_resolver_ipv4.t
@@ -0,0 +1,200 @@
+#!/usr/bin/perl
+
+# (C) Sergey Kandaurov
+# (C) Eugene Grebenschikov
+# (C) Nginx, Inc.
+
+# Tests for http resolver with ipv4/ipv6 parameters.
+
+###############################################################################
+
+use warnings;
+use strict;
+
+use Test::More;
+
+BEGIN { use FindBin; chdir($FindBin::Bin); }
+
+use lib 'lib';
+use Test::Nginx;
+
+###############################################################################
+
+select STDERR; $| = 1;
+select STDOUT; $| = 1;
+
+my $t = Test::Nginx->new()->has(qw/http proxy rewrite/);
+
+$t->write_file_expand('nginx.conf', <<'EOF');
+
+%%TEST_GLOBALS%%
+
+daemon off;
+
+events {
+}
+
+http {
+    %%TEST_GLOBALS_HTTP%%
+
+    server {
+        listen       127.0.0.1:8080;
+        server_name  localhost;
+
+        location / {
+            proxy_pass  http://$arg_h:%%PORT_8081%%/;
+            resolver  127.0.0.1:%%PORT_8980_UDP%% ipv4=on ipv6=on;
+        }
+
+        location /ipv4 {
+            proxy_pass  http://$arg_h:%%PORT_8081%%/;
+            resolver  127.0.0.1:%%PORT_8980_UDP%% ipv4=on ipv6=off;
+        }
+
+        location /ipv6 {
+            proxy_pass  http://$arg_h:%%PORT_8081%%/;
+            resolver  127.0.0.1:%%PORT_8980_UDP%% ipv4=off ipv6=on;
+        }
+    }
+
+    server {
+        listen       127.0.0.1:8081;
+        server_name  localhost;
+
+        location / {
+            return  200 "ipv4";
+        }
+    }
+
+    server {
+        listen       [::1]:%%PORT_8081%%;
+        server_name  localhost;
+
+        location / {
+            return  200 "ipv6";
+        }
+    }
+}
+
+EOF
+
+$t->try_run('no resolver ipv4')->plan(3);
+
+$t->run_daemon(\&dns_daemon, port(8980), $t);
+$t->waitforfile($t->testdir . '/' . port(8980));
+
+###############################################################################
+
+like(many('/', 10), qr/ipv4: \d+, ipv6: \d+/, 'ipv4 ipv6');
+is(many('/ipv4', 10), 'ipv4: 10', 'ipv4 only');
+is(many('/ipv6', 10), 'ipv6: 10', 'ipv6 only');
+
+###############################################################################
+
+sub many {
+	my ($uri, $count) = @_;
+	my %hits;
+
+	for (1 .. $count) {
+		if (http_get("$uri?h=example.com") =~ /(ipv(4|6))/) {;
+			$hits{$1} = 0 unless defined $hits{$1};
+			$hits{$1}++;
+		}
+	}
+
+	return join ', ', map { $_ . ": " . $hits{$_} } sort keys %hits;
+}
+
+###############################################################################
+
+sub reply_handler {
+	my ($recv_data, $port) = @_;
+
+	my (@name, @rdata);
+
+	use constant NOERROR	=> 0;
+
+	use constant A		=> 1;
+	use constant AAAA	=> 28;
+
+	use constant IN		=> 1;
+
+	# default values
+
+	my ($hdr, $rcode, $ttl) = (0x8180, NOERROR, 3600);
+
+	# decode name
+
+	my ($len, $offset) = (undef, 12);
+	while (1) {
+		$len = unpack("\@$offset C", $recv_data);
+		last if $len == 0;
+		$offset++;
+		push @name, unpack("\@$offset A$len", $recv_data);
+		$offset += $len;
+	}
+
+	$offset -= 1;
+	my ($id, $type, $class) = unpack("n x$offset n2", $recv_data);
+
+	my $name = join('.', @name);
+	if ($name eq 'example.com') {
+		if ($type == A) {
+			push @rdata, rd_addr($ttl, '127.0.0.1');
+		}
+		if ($type == AAAA) {
+			push @rdata, rd_addr6($ttl, "::1");
+		}
+	}
+
+	$len = @name;
+	pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
+		0, 0, @name, $type, $class) . join('', @rdata);
+}
+
+sub rd_addr {
+	my ($ttl, $addr) = @_;
+
+	my $code = 'split(/\./, $addr)';
+
+	pack 'n3N nC4', 0xc00c, A, IN, $ttl, eval "scalar $code", eval($code);
+}
+
+sub expand_ip6 {
+	my ($addr) = @_;
+
+	substr ($addr, index($addr, "::"), 2) =
+		join "0", map { ":" } (0 .. 8 - (split /:/, $addr) + 1);
+	map { hex "0" x (4 - length $_) . "$_" } split /:/, $addr;
+}
+
+sub rd_addr6 {
+	my ($ttl, $addr) = @_;
+
+	pack 'n3N nn8', 0xc00c, AAAA, IN, $ttl, 16, expand_ip6($addr);
+}
+
+sub dns_daemon {
+	my ($port, $t) = @_;
+
+	my ($data, $recv_data);
+	my $socket = IO::Socket::INET->new(
+		LocalAddr => '127.0.0.1',
+		LocalPort => $port,
+		Proto => 'udp',
+	)
+		or die "Can't create listening socket: $!\n";
+
+	# signal we are ready
+
+	open my $fh, '>', $t->testdir() . '/' . $port;
+	close $fh;
+
+	while (1) {
+		$socket->recv($recv_data, 65536);
+		$data = reply_handler($recv_data, $port);
+		$socket->send($data);
+	}
+}
+
+###############################################################################

--- a/proxy_protocol2.t
+++ b/proxy_protocol2.t
@@ -24,7 +24,7 @@ select STDOUT; $| = 1;
 
 my $t = Test::Nginx->new()->has(qw/http access realip/);
 
-$t->write_file_expand('nginx.conf', <<'EOF')->plan(28);
+$t->write_file_expand('nginx.conf', <<'EOF')->plan(32);
 
 %%TEST_GLOBALS%%
 
@@ -41,6 +41,9 @@ http {
     add_header X-IP $remote_addr!$remote_port;
     add_header X-PP $proxy_protocol_addr!$proxy_protocol_port;
     add_header X-PPS $proxy_protocol_server_addr!$proxy_protocol_server_port;
+    add_header X-TL $proxy_protocol_tlv_0x3-$proxy_protocol_tlv_0x0000ae-$proxy_protocol_tlv_0x0f;
+    add_header X-NT $proxy_protocol_tlv_unique_id-$proxy_protocol_tlv_ssl_cn-$proxy_protocol_tlv_ssl_0x22-$proxy_protocol_tlv_ssl_verify;
+    add_header X-NT2 $proxy_protocol_tlv_unique_id-$proxy_protocol_tlv_ssl_version-$proxy_protocol_tlv_ssl_0x21-$proxy_protocol_tlv_ssl_verify;
 
     server {
         listen       127.0.0.1:8080 proxy_protocol;
@@ -78,8 +81,14 @@ my $p = pack("N3C", 0x0D0A0D0A, 0x000D0A
 my $tcp4 = $p . pack("CnN2n2", 0x11, 12, 0xc0000201, 0xc0000202, 123, 5678);
 my $tcp6 = $p . pack("CnNx8NNx8Nn2", 0x21, 36,
 	0x20010db8, 0x00000001, 0x20010db8, 0x00000002, 123, 5678);
-my $tlv = $p . pack("CnN2n2x9", 0x11, 21, 0xc0000201, 0xc0000202, 123, 5678);
 my $unk1 = $p . pack("Cxx", 0x01);
+my $tlv = $p . pack("CnN2n2N3", 0x11, 24, 0xc0000201, 0xc0000202, 123, 5678,
+	0x03000141, 0xAE000531, 0x32333435);
+my $tlv2 = $p . pack("CnN2n2N7", 0x11, 40, 0xc0000201, 0xc0000202, 123, 5678,
+	0x05000555, 0x4E495151,0x20001100, 0xdeadbeef, 0x22000966, 0x6f6f2e62,
+	0x61727272);
+my $tlv3 = $p . pack("CnN2n2N5", 0x11, 32, 0xc0000201, 0xc0000202, 123, 5678,
+	0x05000555, 0x4E495151,0x20000900, 0x00000000, 0x23000132);
 my $unk2 = $p . pack("CnC4", 0x41, 4, 1, 2, 3, 4);
 my $r;
 
@@ -102,6 +111,16 @@ like($r, qr/SEE-THIS/, 'tlv request');
 like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tlv proxy');
 like($r, qr/X-PPS: 192.0.2.2!5678\x0d/, 'tlv proxy server');
 unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tlv client');
+like($r, qr/X-TL: A-12345-\x0d/, 'tlv raw variables');
+like($r, qr/X-NT: ---\x0d/, 'tlv missing variables');
+
+$r = pp_get('/t1', $tlv2);
+like($r, qr/X-NT: UNIQQ-foo.barrr-foo.barrr-3735928559\x0d/,
+	'tlv named variables');
+
+$r = pp_get('/t1', $tlv3);
+like($r, qr/X-NT2: UNIQQ-2-2-0\x0d/,
+	'tlv named variables');
 
 $r = pp_get('/t1', $unk1);
 like($r, qr/SEE-THIS/, 'unknown request 1');