Fix perl warnings in tests

* tests/FTPServer.pm: Escape '{' in RE to fix warnings
* tests/FTPTest.pm: Likewise
* tests/HTTPServer.pm: Likewise
* tests/HTTPTest.pm: Likewise
* tests/Test-proxied-https-auth-keepalive.px: Likewise
* tests/Test-proxied-https-auth.px: Likewise
Escape '{' in RE to fix warnings:
Unescaped left brace in regex is deprecated, passed through in regex;
marked by <-- HERE in m/{{ <-- HERE port}}/
This commit is contained in:
Anton Yuzhaninov 2017-04-05 19:06:42 +03:00 committed by Tim Rühsen
parent f381831d88
commit 7ffe93cabb
6 changed files with 6 additions and 6 deletions

View File

@ -589,7 +589,7 @@ sub new
foreach my $file (keys %{$self->{_input}}) foreach my $file (keys %{$self->{_input}})
{ {
my $ref = \$self->{_input}{$file}{content}; my $ref = \$self->{_input}{$file}{content};
$$ref =~ s/{{port}}/$self->sockport/eg; $$ref =~ s/\Q{{port}}/$self->sockport/eg;
} }
return $self; return $self;

View File

@ -53,7 +53,7 @@ sub _substitute_port
{ {
my $self = shift; my $self = shift;
my $ret = shift; my $ret = shift;
$ret =~ s/{{port}}/$self->{_server}->sockport/eg; $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
return $ret; return $ret;
} }

View File

@ -310,7 +310,7 @@ sub _substitute_port
{ {
my $self = shift; my $self = shift;
my $ret = shift; my $ret = shift;
$ret =~ s/{{port}}/$self->sockport/eg; $ret =~ s/\Q{{port}}/$self->sockport/eg;
return $ret; return $ret;
} }

View File

@ -47,7 +47,7 @@ sub _substitute_port
{ {
my $self = shift; my $self = shift;
my $ret = shift; my $ret = shift;
$ret =~ s/{{port}}/$self->{_server}->sockport/eg; $ret =~ s/\Q{{port}}/$self->{_server}->sockport/eg;
return $ret; return $ret;
} }

View File

@ -153,7 +153,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
. " --password=Dodgson -e https_proxy=localhost:{{port}}" . " --password=Dodgson -e https_proxy=localhost:{{port}}"
. " --no-check-certificate" . " --no-check-certificate"
. " https://no.such.domain/needs-auth.txt"; . " https://no.such.domain/needs-auth.txt";
$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; $cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
if (defined $srcdir) { if (defined $srcdir) {
$VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl'; $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';

View File

@ -152,7 +152,7 @@ my $cmdline = $WgetTest::WGETPATH . " --user=fiddle-dee-dee"
. " --password=Dodgson -e https_proxy=localhost:{{port}}" . " --password=Dodgson -e https_proxy=localhost:{{port}}"
. " --no-check-certificate" . " --no-check-certificate"
. " https://no.such.domain/needs-auth.txt"; . " https://no.such.domain/needs-auth.txt";
$cmdline =~ s/{{port}}/$SOCKET->sockport()/e; $cmdline =~ s/\Q{{port}}/$SOCKET->sockport()/e;
if (defined $srcdir) { if (defined $srcdir) {
$VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl'; $VALGRIND_SUPP_FILE = $srcdir . '/valgrind-suppressions-ssl';