updated IO::Socket::SSL requirement to 1.84

mojolicious · Mar 16, 2014 · 801901a · 801901a
1 parent fef93ad
commit 801901a
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 25 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,8 @@
 
 4.90  2014-03-16
   - Removed deprecated to_rel method from Mojo::URL.
+  - Updated IO::Socket::SSL requirement to 1.84 due to breaking changes in
+    IO::Socket::SSL.
   - Improved documentation browser with more accessible links and readable
     inline code.
   - Fixed textarea and title parsing bugs in Mojo::DOM::HTML.

diff --git a/lib/Mojo/IOLoop.pm b/lib/Mojo/IOLoop.pm
@@ -311,7 +311,7 @@ is loaded.
 
 For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
 support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.20+) and
-L<IO::Socket::SSL> (1.75+) will be used automatically if they are installed.
+L<IO::Socket::SSL> (1.84+) will be used automatically if they are installed.
 Individual features can also be disabled with the C<MOJO_NO_IPV6> and
 C<MOJO_NO_TLS> environment variables.
 

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -14,7 +14,7 @@ use constant IPV6 => $ENV{MOJO_NO_IPV6}
 # TLS support requires IO::Socket::SSL
 use constant TLS => $ENV{MOJO_NO_TLS}
   ? 0
-  : eval 'use IO::Socket::SSL 1.75 (); 1';
+  : eval 'use IO::Socket::SSL 1.84 (); 1';
 use constant TLS_READ  => TLS ? IO::Socket::SSL::SSL_WANT_READ()  : 0;
 use constant TLS_WRITE => TLS ? IO::Socket::SSL::SSL_WANT_WRITE() : 0;
 
@@ -97,18 +97,18 @@ sub _try {
 
   return $self->_cleanup->emit_safe(connect => $handle)
     if !$args->{tls} || $handle->isa('IO::Socket::SSL');
-  return $self->emit(error => 'IO::Socket::SSL 1.75 required for TLS support')
+  return $self->emit(error => 'IO::Socket::SSL 1.84 required for TLS support')
     unless TLS;
 
   # Upgrade
   weaken $self;
   my %options = (
     SSL_ca_file => $args->{tls_ca}
       && -T $args->{tls_ca} ? $args->{tls_ca} : undef,
-    SSL_cert_file       => $args->{tls_cert},
-    SSL_error_trap      => sub { $self->_cleanup->emit(error => $_[1]) },
-    SSL_hostname        => $args->{address},
-    SSL_key_file        => $args->{tls_key},
+    SSL_cert_file  => $args->{tls_cert},
+    SSL_error_trap => sub { $self->_cleanup->emit(error => $_[1]) },
+    SSL_hostname   => IO::Socket::SSL->can_client_sni ? $args->{address} : '',
+    SSL_key_file   => $args->{tls_key},
     SSL_startHandshake  => 0,
     SSL_verify_mode     => $args->{tls_ca} ? 0x01 : 0x00,
     SSL_verifycn_name   => $args->{address},
@@ -197,7 +197,7 @@ implements the following new ones.
   $client->connect(address => '127.0.0.1', port => 3000);
 
 Open a socket connection to a remote host. Note that TLS support depends on
-L<IO::Socket::SSL> (1.75+) and IPv6 support on L<IO::Socket::IP> (0.20+).
+L<IO::Socket::SSL> (1.84+) and IPv6 support on L<IO::Socket::IP> (0.20+).
 
 These options are currently available:
 

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -16,7 +16,7 @@ use constant IPV6 => $ENV{MOJO_NO_IPV6}
 # TLS support requires IO::Socket::SSL
 use constant TLS => $ENV{MOJO_NO_TLS}
   ? 0
-  : eval 'use IO::Socket::SSL 1.75 (); 1';
+  : eval 'use IO::Socket::SSL 1.84 (); 1';
 use constant TLS_READ  => TLS ? IO::Socket::SSL::SSL_WANT_READ()  : 0;
 use constant TLS_WRITE => TLS ? IO::Socket::SSL::SSL_WANT_WRITE() : 0;
 
@@ -87,7 +87,7 @@ sub listen {
   $self->{handle} = $handle;
 
   return unless $args->{tls};
-  croak "IO::Socket::SSL 1.75 required for TLS support" unless TLS;
+  croak "IO::Socket::SSL 1.84 required for TLS support" unless TLS;
 
   # Prioritize RC4 to mitigate BEAST attack
   $self->{tls} = {
@@ -235,7 +235,7 @@ Get handle for server.
   $server->listen(port => 3000);
 
 Create a new listen socket. Note that TLS support depends on
-L<IO::Socket::SSL> (1.75+) and IPv6 support on L<IO::Socket::IP> (0.20+).
+L<IO::Socket::SSL> (1.84+) and IPv6 support on L<IO::Socket::IP> (0.20+).
 
 These options are currently available:
 

diff --git a/lib/Mojo/Server/Daemon.pm b/lib/Mojo/Server/Daemon.pm
@@ -295,7 +295,7 @@ support.
 
 For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
 support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.20+) and
-L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+L<IO::Socket::SSL> (1.84+) will be used automatically by L<Mojo::IOLoop> if
 they are installed. Individual features can also be disabled with the
 C<MOJO_NO_IPV6> and C<MOJO_NO_TLS> environment variables.
 

diff --git a/lib/Mojo/Server/Hypnotoad.pm b/lib/Mojo/Server/Hypnotoad.pm
@@ -186,7 +186,7 @@ file with it, and send a L</"USR2"> signal to the already running server.
 
 For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
 support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.20+) and
-L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+L<IO::Socket::SSL> (1.84+) will be used automatically by L<Mojo::IOLoop> if
 they are installed. Individual features can also be disabled with the
 C<MOJO_NO_IPV6> and C<MOJO_NO_TLS> environment variables.
 

diff --git a/lib/Mojo/Server/Morbo.pm b/lib/Mojo/Server/Morbo.pm
@@ -129,7 +129,7 @@ To start applications with it you can use the L<morbo> script.
 
 For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
 support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.20+) and
-L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+L<IO::Socket::SSL> (1.84+) will be used automatically by L<Mojo::IOLoop> if
 they are installed. Individual features can also be disabled with the
 C<MOJO_NO_IPV6> and C<MOJO_NO_TLS> environment variables.
 

diff --git a/lib/Mojo/Server/Prefork.pm b/lib/Mojo/Server/Prefork.pm
@@ -262,7 +262,7 @@ should avoid modifying signal handlers in your applications.
 
 For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
 support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.20+) and
-L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+L<IO::Socket::SSL> (1.84+) will be used automatically by L<Mojo::IOLoop> if
 they are installed. Individual features can also be disabled with the
 C<MOJO_NO_IPV6> and C<MOJO_NO_TLS> environment variables.
 

diff --git a/lib/Mojo/UserAgent.pm b/lib/Mojo/UserAgent.pm
@@ -473,7 +473,7 @@ safely.
 
 For better scalability (epoll, kqueue) and to provide IPv6 as well as TLS
 support, the optional modules L<EV> (4.0+), L<IO::Socket::IP> (0.20+) and
-L<IO::Socket::SSL> (1.75+) will be used automatically by L<Mojo::IOLoop> if
+L<IO::Socket::SSL> (1.84+) will be used automatically by L<Mojo::IOLoop> if
 they are installed. Individual features can also be disabled with the
 C<MOJO_NO_IPV6> and C<MOJO_NO_TLS> environment variables.
 

diff --git a/lib/Mojolicious/Command/version.pm b/lib/Mojolicious/Command/version.pm
@@ -25,7 +25,7 @@ CORE
 OPTIONAL
   EV 4.0+               ($ev)
   IO::Socket::IP 0.20+  ($ipv6)
-  IO::Socket::SSL 1.75+ ($tls)
+  IO::Socket::SSL 1.84+ ($tls)
 
 EOF
 

diff --git a/t/mojo/ioloop_tls.t b/t/mojo/ioloop_tls.t
@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
 
 plan skip_all => 'set TEST_TLS to enable this test (developer only!)'
   unless $ENV{TEST_TLS};
-plan skip_all => 'IO::Socket::SSL 1.75 required for this test!'
+plan skip_all => 'IO::Socket::SSL 1.84 required for this test!'
   unless Mojo::IOLoop::Server::TLS;
 
 # To regenerate all required certificates run these commands (18.04.2012)

diff --git a/t/mojo/user_agent_online.t b/t/mojo/user_agent_online.t
@@ -12,7 +12,7 @@ plan skip_all => 'set TEST_ONLINE to enable this test (developer only!)'
   unless $ENV{TEST_ONLINE};
 plan skip_all => 'IO::Socket::IP 0.20 required for this test!'
   unless Mojo::IOLoop::Server::IPV6;
-plan skip_all => 'IO::Socket::SSL 1.75 required for this test!'
+plan skip_all => 'IO::Socket::SSL 1.84 required for this test!'
   unless Mojo::IOLoop::Server::TLS;
 
 use IO::Socket::INET;
@@ -203,9 +203,7 @@ is $tx->res->code,   200,                       'right status';
 
 # HTTPS request that requires SNI
 SKIP: {
-  skip 'SNI support required!', 1
-    unless IO::Socket::SSL->can('can_client_sni')
-    && IO::Socket::SSL->can_client_sni;
+  skip 'SNI support required!', 1 unless IO::Socket::SSL->can_client_sni;
 
   $tx = $ua->get('https://google.de');
   like $ua->ioloop->stream($tx->connection)

diff --git a/t/mojo/user_agent_tls.t b/t/mojo/user_agent_tls.t
@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
 
 plan skip_all => 'set TEST_TLS to enable this test (developer only!)'
   unless $ENV{TEST_TLS};
-plan skip_all => 'IO::Socket::SSL 1.75 required for this test!'
+plan skip_all => 'IO::Socket::SSL 1.84 required for this test!'
   unless Mojo::IOLoop::Server::TLS;
 
 use Mojo::IOLoop;

diff --git a/t/mojo/websocket_proxy_tls.t b/t/mojo/websocket_proxy_tls.t
@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
 
 plan skip_all => 'set TEST_TLS to enable this test (developer only!)'
   unless $ENV{TEST_TLS};
-plan skip_all => 'IO::Socket::SSL 1.75 required for this test!'
+plan skip_all => 'IO::Socket::SSL 1.84 required for this test!'
   unless Mojo::IOLoop::Server::TLS;
 
 use Mojo::IOLoop;

diff --git a/t/mojolicious/tls_lite_app.t b/t/mojolicious/tls_lite_app.t
@@ -10,7 +10,7 @@ use Mojo::IOLoop::Server;
 
 plan skip_all => 'set TEST_TLS to enable this test (developer only!)'
   unless $ENV{TEST_TLS};
-plan skip_all => 'IO::Socket::SSL 1.75 required for this test!'
+plan skip_all => 'IO::Socket::SSL 1.84 required for this test!'
   unless Mojo::IOLoop::Server::TLS;
 
 use Mojo::IOLoop;