# HG changeset patch # User Sergey Kandaurov # Date 1664300986 -14400 # Node ID 88a098b00534ccd403c0704589a94e232f29029f # Parent 64f19063adfeed78a3a491573d3d0509a6d15494 Tests: fixed previous commit mismerge. diff --git a/proxy_protocol.t b/proxy_protocol.t --- a/proxy_protocol.t +++ b/proxy_protocol.t @@ -87,13 +87,13 @@ my $r; $r = pp_get('/t1', $tcp4); like($r, qr/SEE-THIS/, 'tcp4 request'); like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tcp4 proxy'); -like($r, qr/X-PPS: 192.0.2.2!567\x0d/, 'tcp4 proxy server'); +like($r, qr/X-PPS: 192.0.2.2!5678\x0d/, 'tcp4 proxy server'); unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tcp4 client'); $r = pp_get('/t1', $tcp6); like($r, qr/SEE-THIS/, 'tcp6 request'); like($r, qr/X-PP: 2001:DB8::1!123\x0d/i, 'tcp6 proxy'); -like($r, qr/X-PPS: 2001:DB8::2!567\x0d/i, 'tcp6 proxy server'); +like($r, qr/X-PPS: 2001:DB8::2!5678\x0d/i, 'tcp6 proxy server'); unlike($r, qr/X-IP: (2001:DB8::1|[^!]+!123\x0d)/i, 'tcp6 client'); $r = pp_get('/t1', $unk1); diff --git a/proxy_protocol2.t b/proxy_protocol2.t --- a/proxy_protocol2.t +++ b/proxy_protocol2.t @@ -88,19 +88,19 @@ my $r; $r = pp_get('/t1', $tcp4); like($r, qr/SEE-THIS/, 'tcp4 request'); like($r, qr/X-PP: 192.0.2.1!123\x0d/, 'tcp4 proxy'); -like($r, qr/X-PPS: 192.0.2.2!567\x0d/, 'tcp4 proxy server'); +like($r, qr/X-PPS: 192.0.2.2!5678\x0d/, 'tcp4 proxy server'); unlike($r, qr/X-IP: (192.0.2.1|[^!]+!123\x0d)/, 'tcp4 client'); $r = pp_get('/t1', $tcp6); like($r, qr/SEE-THIS/, 'tcp6 request'); like($r, qr/X-PP: 2001:DB8::1!123\x0d/i, 'tcp6 proxy'); -like($r, qr/X-PPS: 2001:DB8::2!567\x0d/i, 'tcp6 proxy server'); +like($r, qr/X-PPS: 2001:DB8::2!5678\x0d/i, 'tcp6 proxy server'); unlike($r, qr/X-IP: (2001:DB8::1|[^!]+!123\x0d)/i, 'tcp6 client'); $r = pp_get('/t1', $tlv); 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!567\x0d/, 'tlv proxy server'); +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'); $r = pp_get('/t1', $unk1);