Mercurial > hg > nginx-tests

changeset 775:a6764c2a9f12

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: fixed DNS label coding in resolver tests. No actual functional changes.
author Sergey Kandaurov <pluknet@nginx.com>
date Thu, 05 Nov 2015 14:02:53 +0300
parents adc32621fb09
children 3fc382902cba
files http_resolver.t http_resolver_aaaa.t mail_resolver.t proxy_next_upstream_tries.t
diffstat 4 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/http_resolver.t
+++ b/http_resolver.t
@@ -312,7 +312,7 @@ sub reply_handler {
 		push @rdata, rd_addr($ttl, '127.0.0.1');
 
 	} elsif ($name eq 'awide.example.net' && $type == A) {
-		push @rdata, pack '(w/a*)3x n2N nC4',
+		push @rdata, pack '(C/a*)3x n2N nC4',
 			('awide', 'example', 'net'), A, IN, $ttl,
 			4, (127, 0, 0, 1);
 
@@ -338,7 +338,7 @@ sub reply_handler {
 
 		my @dname = ('example', 'net');
 		my $rdlen = length(join '', @dname) + @dname + 1;
-		push @rdata, pack("n3N n(w/a*)* x", 0xc012, DNAME, IN, $ttl,
+		push @rdata, pack("n3N n(C/a*)* x", 0xc012, DNAME, IN, $ttl,
 			$rdlen, @dname);
 
 		# alias.example.com. 3600 IN CNAME alias.example.net.
@@ -429,7 +429,7 @@ sub reply_handler {
 	}
 
 	$len = @name;
-	pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
+	pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
 		0, 0, @name, $type, $class) . join('', @rdata);
 }
 
--- a/http_resolver_aaaa.t
+++ b/http_resolver_aaaa.t
@@ -566,7 +566,7 @@ sub reply_handler {
 	}
 
 	$len = @name;
-	pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
+	pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
 		0, 0, @name, $type, $class) . join('', @rdata);
 }
 
--- a/mail_resolver.t
+++ b/mail_resolver.t
@@ -298,7 +298,7 @@ sub reply_handler {
 		} elsif ($port == 8085) {
 			# uncompressed answer
 
-			push @rdata, pack("(w/a*)6x n2N n(w/a*)3x",
+			push @rdata, pack("(C/a*)6x n2N n(C/a*)3x",
 				('1', '0', '0', '127', 'in-addr', 'arpa'),
 				PTR, IN, $ttl, 15, ('a', 'example', 'net'));
 
@@ -311,7 +311,7 @@ sub reply_handler {
 	}
 
 	$len = @name;
-	pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
+	pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
 		0, 0, @name, $type, $class) . join('', @rdata);
 }
 
@@ -321,7 +321,7 @@ sub rd_name {
 
 	@rdname = split /\./, $name;
 	$rdlen = length(join '', @rdname) + @rdname + 1;
-	pack("n3N n(w/a*)* x", 0xc00c, $type, IN, $ttl, $rdlen, @rdname);
+	pack("n3N n(C/a*)* x", 0xc00c, $type, IN, $ttl, $rdlen, @rdname);
 }
 
 sub rd_addr {
--- a/proxy_next_upstream_tries.t
+++ b/proxy_next_upstream_tries.t
@@ -220,7 +220,7 @@ sub reply_handler {
 	@rdata = map { rd_addr($ttl, '127.0.0.1') } (1 .. 3) if $type == A;
 
 	$len = @name;
-	pack("n6 (w/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
+	pack("n6 (C/a*)$len x n2", $id, $hdr | $rcode, 1, scalar @rdata,
 		0, 0, @name, $type, $class) . join('', @rdata);
 }