Skip to content

Commit db67c84

Browse files
committed
Tests: removing unneeded changes in the previous commit.
1 parent f0038c1 commit db67c84

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

proxy_protocol2.t

+2-21
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ select STDOUT; $| = 1;
2424

2525
my $t = Test::Nginx->new()->has(qw/http access realip/);
2626

27-
$t->write_file_expand('nginx.conf', <<'EOF')->plan(32);
27+
$t->write_file_expand('nginx.conf', <<'EOF')->plan(28);
2828
2929
%%TEST_GLOBALS%%
3030
@@ -41,9 +41,6 @@ http {
4141
add_header X-IP $remote_addr!$remote_port;
4242
add_header X-PP $proxy_protocol_addr!$proxy_protocol_port;
4343
add_header X-PPS $proxy_protocol_server_addr!$proxy_protocol_server_port;
44-
add_header X-TL $proxy_protocol_tlv_0x3-$proxy_protocol_tlv_0x0000ae-$proxy_protocol_tlv_0x0f;
45-
add_header X-NT $proxy_protocol_tlv_unique_id-$proxy_protocol_tlv_ssl_cn-$proxy_protocol_tlv_ssl_0x22-$proxy_protocol_tlv_ssl_verify;
46-
add_header X-NT2 $proxy_protocol_tlv_unique_id-$proxy_protocol_tlv_ssl_version-$proxy_protocol_tlv_ssl_0x21-$proxy_protocol_tlv_ssl_verify;
4744
4845
server {
4946
listen 127.0.0.1:8080 proxy_protocol;
@@ -81,14 +78,8 @@ my $p = pack("N3C", 0x0D0A0D0A, 0x000D0A51, 0x5549540A, 0x21);
8178
my $tcp4 = $p . pack("CnN2n2", 0x11, 12, 0xc0000201, 0xc0000202, 123, 5678);
8279
my $tcp6 = $p . pack("CnNx8NNx8Nn2", 0x21, 36,
8380
0x20010db8, 0x00000001, 0x20010db8, 0x00000002, 123, 5678);
81+
my $tlv = $p . pack("CnN2n2x9", 0x11, 21, 0xc0000201, 0xc0000202, 123, 5678);
8482
my $unk1 = $p . pack("Cxx", 0x01);
85-
my $tlv = $p . pack("CnN2n2N3", 0x11, 24, 0xc0000201, 0xc0000202, 123, 5678,
86-
0x03000141, 0xAE000531, 0x32333435);
87-
my $tlv2 = $p . pack("CnN2n2N7", 0x11, 40, 0xc0000201, 0xc0000202, 123, 5678,
88-
0x05000555, 0x4E495151,0x20001100, 0xdeadbeef, 0x22000966, 0x6f6f2e62,
89-
0x61727272);
90-
my $tlv3 = $p . pack("CnN2n2N5", 0x11, 32, 0xc0000201, 0xc0000202, 123, 5678,
91-
0x05000555, 0x4E495151,0x20000900, 0x00000000, 0x23000132);
9283
my $unk2 = $p . pack("CnC4", 0x41, 4, 1, 2, 3, 4);
9384
my $r;
9485

@@ -111,16 +102,6 @@ like($r, qr/SEE-THIS/, 'tlv request');
111102
like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tlv proxy');
112103
like($r, qr/X-PPS: 192.0.2.2!5678\x0d/, 'tlv proxy server');
113104
unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tlv client');
114-
like($r, qr/X-TL: A-12345-\x0d/, 'tlv raw variables');
115-
like($r, qr/X-NT: ---\x0d/, 'tlv missing variables');
116-
117-
$r = pp_get('/t1', $tlv2);
118-
like($r, qr/X-NT: UNIQQ-foo.barrr-foo.barrr-3735928559\x0d/,
119-
'tlv named variables');
120-
121-
$r = pp_get('/t1', $tlv3);
122-
like($r, qr/X-NT2: UNIQQ-2-2-0\x0d/,
123-
'tlv named variables');
124105

125106
$r = pp_get('/t1', $unk1);
126107
like($r, qr/SEE-THIS/, 'unknown request 1');

0 commit comments

Comments
 (0)