r74049 - in /branches/upstream/libio-socket-ssl-perl/current: Changes META.yml Makefile.PL SSL.pm example/async_https_server.pl t/verify_hostname.t
carnil at users.alioth.debian.org
carnil at users.alioth.debian.org
Fri May 6 05:48:14 UTC 2011
Author: carnil
Date: Fri May 6 05:47:21 2011
New Revision: 74049
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=74049
Log:
[svn-upgrade] new version libio-socket-ssl-perl (1.40)
Modified:
branches/upstream/libio-socket-ssl-perl/current/Changes
branches/upstream/libio-socket-ssl-perl/current/META.yml
branches/upstream/libio-socket-ssl-perl/current/Makefile.PL
branches/upstream/libio-socket-ssl-perl/current/SSL.pm
branches/upstream/libio-socket-ssl-perl/current/example/async_https_server.pl
branches/upstream/libio-socket-ssl-perl/current/t/verify_hostname.t
Modified: branches/upstream/libio-socket-ssl-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-socket-ssl-perl/current/Changes?rev=74049&op=diff
==============================================================================
--- branches/upstream/libio-socket-ssl-perl/current/Changes (original)
+++ branches/upstream/libio-socket-ssl-perl/current/Changes Fri May 6 05:47:21 2011
@@ -1,4 +1,10 @@
+v1.40 2011.05.02
+- integrated patch from GAAS to get IDN support from URI.
+ https://rt.cpan.org/Ticket/Display.html?id=67676
+v1.39_1 2011.05.02
+- fix in exampel/async_https_server.
+ Thanks to DetlefPilzecker[AT]web[DOT]de for reporting
v1.39 2011.03.03
- fixed documentation of http verification: wildcards in cn is allowed
v1.38_1 2011.01.24
Modified: branches/upstream/libio-socket-ssl-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-socket-ssl-perl/current/META.yml?rev=74049&op=diff
==============================================================================
--- branches/upstream/libio-socket-ssl-perl/current/META.yml (original)
+++ branches/upstream/libio-socket-ssl-perl/current/META.yml Fri May 6 05:47:21 2011
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: IO-Socket-SSL
-version: 1.39
+version: 1.40
abstract: Nearly transparent SSL encapsulation for IO::Socket::INET.
author:
- Steffen Ullrich & Peter Behroozi & Marko Asplund
@@ -17,7 +17,7 @@
directory:
- t
- inc
-generated_by: ExtUtils::MakeMaker version 6.54
+generated_by: ExtUtils::MakeMaker version 6.55_02
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: 1.4
Modified: branches/upstream/libio-socket-ssl-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-socket-ssl-perl/current/Makefile.PL?rev=74049&op=diff
==============================================================================
--- branches/upstream/libio-socket-ssl-perl/current/Makefile.PL (original)
+++ branches/upstream/libio-socket-ssl-perl/current/Makefile.PL Fri May 6 05:47:21 2011
@@ -57,14 +57,14 @@
}
# check if we have something which handles IDN
-if ( ! eval { require Net::IDN::Encode } and ! eval { require Net::LibIDN }) {
+if ( ! eval { require Net::IDN::Encode } and ! eval { require Net::LibIDN } and ! eval { require URI; URI->VERSION(1.50) }) {
warn <<'EOM';
WARNING
No library for handling international domain names found.
It will work but croak if you try to verify an international name against
a certificate.
-It's recommended to install either Net::IDN::Encode or Net::LibIDN
+It's recommended to install either Net::IDN::Encode, Net::LibIDN or URI version>=1.50
EOM
}
Modified: branches/upstream/libio-socket-ssl-perl/current/SSL.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-socket-ssl-perl/current/SSL.pm?rev=74049&op=diff
==============================================================================
--- branches/upstream/libio-socket-ssl-perl/current/SSL.pm (original)
+++ branches/upstream/libio-socket-ssl-perl/current/SSL.pm Fri May 6 05:47:21 2011
@@ -78,7 +78,7 @@
}) {
@ISA = qw(IO::Socket::INET);
}
- $VERSION = '1.39';
+ $VERSION = '1.40';
$GLOBAL_CONTEXT_ARGS = {};
#Make $DEBUG another name for $Net::SSLeay::trace
@@ -121,12 +121,14 @@
*{idn_to_ascii} = \&Net::IDN::Encode::domain_to_ascii;
} elsif ( eval { require Net::LibIDN }) {
*{idn_to_ascii} = \&Net::LibIDN::idn_to_ascii;
+ } elsif ( eval { require URI; URI->VERSION(1.50) }) {
+ *{idn_to_ascii} = sub { URI->new("http://" . shift)->host }
} else {
# default: croak if we really got an unencoded international domain
*{idn_to_ascii} = sub {
my $domain = shift;
return $domain if $domain =~m{^[a-zA-Z0-9-_\.]+$};
- croak "cannot handle international domains, please install Net::LibIDN or Net::IDN::Encode"
+ croak "cannot handle international domains, please install Net::LibIDN, Net::IDN::Encode or URI"
}
}
}
Modified: branches/upstream/libio-socket-ssl-perl/current/example/async_https_server.pl
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-socket-ssl-perl/current/example/async_https_server.pl?rev=74049&op=diff
==============================================================================
--- branches/upstream/libio-socket-ssl-perl/current/example/async_https_server.pl (original)
+++ branches/upstream/libio-socket-ssl-perl/current/example/async_https_server.pl Fri May 6 05:47:21 2011
@@ -21,6 +21,7 @@
LocalAddr => '0.0.0.0:9000',
Listen => 10,
Reuse => 1,
+ Blocking => 0,
) || die $!;
event_new( $server, EV_READ|EV_PERSIST, \&_s_accept )->add();
@@ -134,7 +135,7 @@
DEBUG( $SSL_ERROR );
if ( $SSL_ERROR == SSL_WANT_READ ) {
# retry write once we can read
- event_new( $fdc, EV_READ, \&_client_write )->add;
+ event_new( $fdc, EV_READ, \&_client_write_response )->add;
} else {
$event->add; # retry again
}
Modified: branches/upstream/libio-socket-ssl-perl/current/t/verify_hostname.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libio-socket-ssl-perl/current/t/verify_hostname.t?rev=74049&op=diff
==============================================================================
--- branches/upstream/libio-socket-ssl-perl/current/t/verify_hostname.t (original)
+++ branches/upstream/libio-socket-ssl-perl/current/t/verify_hostname.t Fri May 6 05:47:21 2011
@@ -22,7 +22,7 @@
# if we have an IDN library max the IDN tests too
my $can_idn = eval { require Encode } &&
- ( eval { require Net::LibIDN } || eval { require Net::IDN::Encode } );
+ ( eval { require Net::LibIDN } || eval { require Net::IDN::Encode } || eval { require URI; URI->VERSION(1.50) } );
$|=1;
my $max = 40;
More information about the Pkg-perl-cvs-commits
mailing list