fixed small bug that prevented already prepared IO::Socket::SSL handl…

…es to be used by Mojo::UserAgent
mojolicious · May 20, 2012 · 8655c61 · 8655c61
1 parent c8a9113
commit 8655c61
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -3,6 +3,8 @@
   - Added merge method to Mojo::Path.
   - Improved documentation.
   - Improved tests.
+  - Fixed small bug that prevented already prepared IO::Socket::SSL handles to
+    be used by Mojo::UserAgent.
   - Fixed small Mojo::URL and Mojo::Path stringification bugs.
 
 2.95  2012-05-10

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -2,7 +2,7 @@ package Mojo::IOLoop::Client;
 use Mojo::Base 'Mojo::EventEmitter';
 
 use IO::Socket::INET;
-use Scalar::Util 'weaken';
+use Scalar::Util qw/blessed weaken/;
 use Socket qw(IPPROTO_TCP SO_ERROR TCP_NODELAY);
 
 # IPv6 support requires IO::Socket::IP
@@ -75,7 +75,7 @@ sub _connect {
 
   # TLS
   weaken $self;
-  if ($args->{tls}) {
+  if ($args->{tls} && !$handle->isa('IO::Socket::SSL')) {
 
     # No TLS support
     return $self->emit_safe(

diff --git a/t/mojo/user_agent_tls.t b/t/mojo/user_agent_tls.t
@@ -12,7 +12,7 @@ plan skip_all => 'set TEST_TLS to enable this test (developer only!)'
   unless $ENV{TEST_TLS};
 plan skip_all => 'IO::Socket::SSL 1.37 required for this test!'
   unless Mojo::IOLoop::Server::TLS;
-plan tests => 19;
+plan tests => 22;
 
 # "That does not compute.
 #  Really?
@@ -56,6 +56,30 @@ ok $tx->success, 'successful';
 is $tx->res->code, 200,      'right status';
 is $tx->res->body, 'works!', 'right content';
 
+# Valid certificates (using an already prepared socket)
+my $sock;
+$ua->ioloop->client(
+  {
+    address  => 'localhost',
+    port     => $port,
+    tls      => 1,
+    tls_ca   => 't/mojo/certs/ca.crt',
+    tls_cert => 't/mojo/certs/client.crt',
+    tls_key  => 't/mojo/certs/client.key'
+  } => sub {
+    my ($loop, $err, $stream) = @_;
+    $sock = $stream->steal_handle;
+    $loop->stop;
+  }
+);
+$ua->ioloop->start;
+$tx = $ua->build_tx(GET => 'https://lalala/');
+$tx->connection($sock);
+$ua->start($tx);
+ok $tx->success, 'successful';
+is $tx->res->code, 200,      'right status';
+is $tx->res->body, 'works!', 'right content';
+
 # Valid certificates (env)
 $ua = Mojo::UserAgent->new(ioloop => $ua->ioloop);
 {