fix connect timeout for TLS handshakes (closes #1097)

mojolicious · May 21, 2017 · d69b981 · d69b981
1 parent 4718745
commit d69b981
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -1,5 +1,7 @@
 
-7.32  2017-05-18
+7.32  2017-05-21
+  - Fixed memory leak in Mojo::IOLoop::Client that sometimes prevented the
+    connect timeout from working correctly for TLS handshakes.
 
 7.31  2017-04-23
   - Removed deprecated files, slurp and spurt functions from Mojo::Util.

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -165,6 +165,7 @@ sub _try_tls {
   $reactor->remove($handle);
 
   # Start TLS handshake
+  weaken $self;
   my $tls = Mojo::IOLoop::TLS->new($handle)->reactor($self->reactor);
   $tls->on(upgrade => sub { $self->_cleanup->emit(connect => pop) });
   $tls->on(error => sub { $self->emit(error => pop) });