diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2014-10-08 08:57:53 +0100 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2014-10-08 08:57:53 +0100 |
commit | 4b426b971e4acf37fdbd08ffa88da4e6979fa133 (patch) | |
tree | dc58425b8b2feaf8b2606141e3e0b2d0f861c1b8 | |
parent | fd870233f2d1ae3b8ee8fffa401f3477204d4f70 (diff) | |
download | perl-libnet-4b426b971e4acf37fdbd08ffa88da4e6979fa133.tar.gz |
Fix PAUSE indexing problem
Net::POP3::_SSLified and Net::SMTP::_SSLified are already used by Net-SSLGlue.
-rw-r--r-- | Changes | 3 | ||||
-rw-r--r-- | lib/Net/POP3.pm | 8 | ||||
-rw-r--r-- | lib/Net/SMTP.pm | 8 |
3 files changed, 10 insertions, 9 deletions
@@ -1,6 +1,7 @@ libnet 1.29 -- TODO - * TODO + * Fix PAUSE indexing problem. Net::POP3::_SSLified and Net::SMTP::_SSLified + are already used by Net-SSLGlue. libnet 1.28 -- Wed Oct 08 2014 diff --git a/lib/Net/POP3.pm b/lib/Net/POP3.pm index 772bf76..dff133f 100644 --- a/lib/Net/POP3.pm +++ b/lib/Net/POP3.pm @@ -19,7 +19,7 @@ use IO::Socket; use Net::Cmd; use Net::Config; -our $VERSION = "2.32"; +our $VERSION = "2.33"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -85,7 +85,7 @@ sub new { ${*$obj}{'net_pop3_arg'} = \%arg; if ($arg{SSL}) { - Net::POP3::_SSLified->start_SSL($obj, + Net::POP3::SSL->start_SSL($obj, SSL_verifycn_name => $host,%arg ) or return; } @@ -136,7 +136,7 @@ sub starttls { my $self = shift; $ssl_class or die $nossl_warn; $self->_STLS or return; - Net::POP3::_SSLified->start_SSL($self, + Net::POP3::SSL->start_SSL($self, %{ ${*$self}{'net_pop3_arg'} }, # (ssl) args given in new @_ # more (ssl) args ) or return; @@ -570,7 +570,7 @@ sub banner { } { - package Net::POP3::_SSLified; + package Net::POP3::SSL; our @ISA = ( $ssl_class ? ($ssl_class):(), 'Net::POP3' ); sub starttls { die "POP3 connection is already in SSL mode" } sub start_SSL { diff --git a/lib/Net/SMTP.pm b/lib/Net/SMTP.pm index 4e0c387..b8c6323 100644 --- a/lib/Net/SMTP.pm +++ b/lib/Net/SMTP.pm @@ -20,7 +20,7 @@ use Net::Cmd; use Net::Config; use Socket 1.3; -our $VERSION = "2.35"; +our $VERSION = "2.36"; # Code for detecting if we can use SSL my $ssl_class = eval { @@ -87,7 +87,7 @@ sub new { ${*$obj}{'net_smtp_arg'} = \%arg; if ($arg{SSL}) { - Net::SMTP::_SSLified->start_SSL($obj,SSL_verifycn_name => $host,%arg) + Net::SMTP::SSL->start_SSL($obj,SSL_verifycn_name => $host,%arg) or return; } @@ -254,7 +254,7 @@ sub starttls { my $self = shift; $ssl_class or die $nossl_warn; $self->_STARTTLS or return; - Net::SMTP::_SSLified->start_SSL($self, + Net::SMTP::SSL->start_SSL($self, %{ ${*$self}{'net_smtp_arg'} }, # (ssl) args given in new @_ # more (ssl) args ) or return; @@ -603,7 +603,7 @@ sub _STARTTLS { shift->command("STARTTLS")->response() == CMD_OK } { - package Net::SMTP::_SSLified; + package Net::SMTP::SSL; our @ISA = ( $ssl_class ? ($ssl_class):(), 'Net::SMTP' ); sub starttls { die "SMTP connection is already in SSL mode" } sub start_SSL { |