From fb8306460b9097c6f19d283a14c558aed220ed9c Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Tue, 10 Mar 2015 08:30:41 +0000 Subject: Convert tabs to spaces --- lib/Net/FTP.pm | 24 ++++++++++++------------ lib/Net/NNTP.pm | 4 ++-- lib/Net/POP3.pm | 4 ++-- lib/Net/SMTP.pm | 14 +++++++------- t/external/ftp-ssl.t | 2 +- t/nntp_ssl.t | 4 ++-- t/pop3_ipv6.t | 2 +- t/pop3_ssl.t | 8 ++++---- t/smtp_ipv6.t | 2 +- t/smtp_ssl.t | 8 ++++---- 10 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lib/Net/FTP.pm b/lib/Net/FTP.pm index 36d89bc..2bdb390 100644 --- a/lib/Net/FTP.pm +++ b/lib/Net/FTP.pm @@ -889,8 +889,8 @@ sub _eprt { Timeout => $ftp->timeout, LocalAddr => $ftp->sockhost, can_ssl() ? ( - %{ ${*$ftp}{net_ftp_tlsargs} }, - SSL_startHandshake => 0, + %{ ${*$ftp}{net_ftp_tlsargs} }, + SSL_startHandshake => 0, ):(), ); ${*$ftp}{net_ftp_intern_port} = 1; @@ -1036,15 +1036,15 @@ sub _dataconn { LocalAddr => ${*$ftp}{net_ftp_localaddr}, Timeout => $ftp->timeout, can_ssl() ? ( - SSL_startHandshake => 0, - $ftp->is_SSL ? ( - SSL_reuse_ctx => $ftp, - SSL_verifycn_name => ${*$ftp}{net_ftp_tlsargs}{SSL_verifycn_name}, - # This will cause the use of SNI if supported by IO::Socket::SSL. - $ftp->can_client_sni ? ( - SSL_hostname => ${*$ftp}{net_ftp_tlsargs}{SSL_hostname} - ):(), - ) :( %{${*$ftp}{net_ftp_tlsargs}} ), + SSL_startHandshake => 0, + $ftp->is_SSL ? ( + SSL_reuse_ctx => $ftp, + SSL_verifycn_name => ${*$ftp}{net_ftp_tlsargs}{SSL_verifycn_name}, + # This will cause the use of SNI if supported by IO::Socket::SSL. + $ftp->can_client_sni ? ( + SSL_hostname => ${*$ftp}{net_ftp_tlsargs}{SSL_hostname} + ):(), + ) :( %{${*$ftp}{net_ftp_tlsargs}} ), ):(), ) or return; } elsif (my $listen = delete ${*$ftp}{net_ftp_listen}) { @@ -1141,7 +1141,7 @@ sub _data_cmd { my $data = $ftp->_dataconn(); if (CMD_INFO == $ftp->response()) { $data->reading - if $data && $cmd =~ /RETR|LIST|NLST/; + if $data && $cmd =~ /RETR|LIST|NLST/; return $data; } $data->_close if $data; diff --git a/lib/Net/NNTP.pm b/lib/Net/NNTP.pm index a1409fd..09e6e35 100644 --- a/lib/Net/NNTP.pm +++ b/lib/Net/NNTP.pm @@ -756,9 +756,9 @@ sub DESTROY { my ($class,$nntp,%arg) = @_; delete @arg{ grep { !m{^SSL_} } keys %arg }; ( $arg{SSL_verifycn_name} ||= $nntp->host ) - =~s{(?can_client_sni; + if ! defined $arg{SSL_hostname} && $class->can_client_sni; my $ok = $class->SUPER::start_SSL($nntp, SSL_verifycn_scheme => 'nntp', %arg diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm index 606bcbb..594ab7b 100644 --- a/lib/Net/POP3.pm +++ b/lib/Net/POP3.pm @@ -577,9 +577,9 @@ sub banner { my ($class,$pop3,%arg) = @_; delete @arg{ grep { !m{^SSL_} } keys %arg }; ( $arg{SSL_verifycn_name} ||= $pop3->host ) - =~s{(?can_client_sni; + if ! defined $arg{SSL_hostname} && $class->can_client_sni; $arg{SSL_verifycn_scheme} ||= 'pop3'; my $ok = $class->SUPER::start_SSL($pop3,%arg); $@ = $ssl_class->errstr if !$ok; diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm index 561281f..7ecd44e 100644 --- a/lib/Net/SMTP.pm +++ b/lib/Net/SMTP.pm @@ -617,9 +617,9 @@ sub _STARTTLS { shift->command("STARTTLS")->response() == CMD_OK } my ($class,$smtp,%arg) = @_; delete @arg{ grep { !m{^SSL_} } keys %arg }; ( $arg{SSL_verifycn_name} ||= $smtp->host ) - =~s{(?can_client_sni; + if ! defined $arg{SSL_hostname} && $class->can_client_sni; $arg{SSL_verifycn_scheme} ||= 'smtp'; my $ok = $class->SUPER::start_SSL($smtp,%arg); $@ = $ssl_class->errstr if !$ok; @@ -764,11 +764,11 @@ Example: # the same with direct SSL $smtp = Net::SMTP->new('mailhost', - Hello => 'my.mail.domain', - Timeout => 30, - Debug => 1, - SSL => 1, - ); + Hello => 'my.mail.domain', + Timeout => 30, + Debug => 1, + SSL => 1, + ); # Connect to the default server from Net::config $smtp = Net::SMTP->new( diff --git a/t/external/ftp-ssl.t b/t/external/ftp-ssl.t index 3036630..44192f1 100644 --- a/t/external/ftp-ssl.t +++ b/t/external/ftp-ssl.t @@ -44,7 +44,7 @@ IO::Socket::SSL->start_SSL($sock, %sslargs, ) or do { plan skip_all => "$server:990 not upgradable to SSL: ". - $IO::Socket::SSL::SSL_ERROR; +i $IO::Socket::SSL::SSL_ERROR; }; plan tests => 9; diff --git a/t/nntp_ssl.t b/t/nntp_ssl.t index 387899f..e6a4fe5 100644 --- a/t/nntp_ssl.t +++ b/t/nntp_ssl.t @@ -115,8 +115,8 @@ sub nntp_server { } elsif ( ! $ssl and $cmd eq 'STARTTLS' ) { print $cl "382 Continue with TLS negotiation\r\n"; if ( ! IO::Socket::SSL->start_SSL($cl, %sslargs)) { - diag("initial ssl handshake with client failed"); - return; + diag("initial ssl handshake with client failed"); + return; } $ssl = 1; } else { diff --git a/t/pop3_ipv6.t b/t/pop3_ipv6.t index 5100951..1c88c1a 100644 --- a/t/pop3_ipv6.t +++ b/t/pop3_ipv6.t @@ -55,7 +55,7 @@ sub pop3_server { last; } elsif ( $cmd eq 'CAPA' ) { print $cl "+OK\r\n". - ".\r\n"; + ".\r\n"; } else { diag("received unknown command: $cmd"); print "-ERR unknown cmd\r\n"; diff --git a/t/pop3_ssl.t b/t/pop3_ssl.t index 3eca064..356de40 100644 --- a/t/pop3_ssl.t +++ b/t/pop3_ssl.t @@ -106,13 +106,13 @@ sub pop3_server { last; } elsif ( $cmd eq 'CAPA' ) { print $cl "+OK\r\n". - ( $ssl ? "" : "STLS\r\n" ). - ".\r\n"; + ( $ssl ? "" : "STLS\r\n" ). + ".\r\n"; } elsif ( ! $ssl and $cmd eq 'STLS' ) { print $cl "+OK starting ssl\r\n"; if ( ! IO::Socket::SSL->start_SSL($cl, %sslargs)) { - diag("initial ssl handshake with client failed"); - return; + diag("initial ssl handshake with client failed"); + return; } $ssl = 1; } else { diff --git a/t/smtp_ipv6.t b/t/smtp_ipv6.t index 48c7246..a31b6ff 100644 --- a/t/smtp_ipv6.t +++ b/t/smtp_ipv6.t @@ -57,7 +57,7 @@ sub smtp_server { print $cl "250 localhost\r\n"; } elsif ( $cmd eq 'EHLO' ) { print $cl "250-localhost\r\n". - "250 HELP\r\n"; + "250 HELP\r\n"; } else { diag("received unknown command: $cmd"); print "500 unknown cmd\r\n"; diff --git a/t/smtp_ssl.t b/t/smtp_ssl.t index e91cc9b..7290176 100644 --- a/t/smtp_ssl.t +++ b/t/smtp_ssl.t @@ -108,13 +108,13 @@ sub smtp_server { print $cl "250 localhost\r\n"; } elsif ( $cmd eq 'EHLO' ) { print $cl "250-localhost\r\n". - ( $ssl ? "" : "250-STARTTLS\r\n" ). - "250 HELP\r\n"; + ( $ssl ? "" : "250-STARTTLS\r\n" ). + "250 HELP\r\n"; } elsif ( ! $ssl and $cmd eq 'STARTTLS' ) { print $cl "250 starting ssl\r\n"; if ( ! IO::Socket::SSL->start_SSL($cl, %sslargs)) { - diag("initial ssl handshake with client failed"); - return; + diag("initial ssl handshake with client failed"); + return; } $ssl = 1; } else { -- cgit v1.2.3-24-ge0c7