use a little less code

mojolicious · Jan 13, 2017 · fcb9107 · fcb9107
1 parent a5ce008
commit fcb9107
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -154,8 +154,7 @@ sub _try_tls {
 
   # Start TLS handshake
   weaken $self;
-  my $tls = $self->{tls} = Mojo::IOLoop::TLS->new(reactor => $reactor);
-  weaken $tls->{reactor};
+  my $tls = Mojo::IOLoop::TLS->new(reactor => $reactor);
   $tls->on(finish => sub { $self->_cleanup->emit(connect => pop) });
   $tls->on(error => sub { $self->emit(error => pop) });
   $tls->negotiate(%$args, handle => $handle);

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -95,17 +95,9 @@ sub _accept {
     $self->emit(accept => $handle) and next unless my $args = $self->{args};
 
     # Start TLS handshake
-    my $tls = $self->{handles}{my $id = "$handle"}
-      = Mojo::IOLoop::TLS->new(reactor => $self->reactor);
-    weaken $tls->{reactor};
-    $tls->on(
-      finish => sub {
-        my $handle = pop;
-        delete $self->{handles}{$id};
-        $self->emit(accept => $handle);
-      }
-    );
-    $tls->on(error => sub { delete $self->{handles}{$id} });
+    my $tls = Mojo::IOLoop::TLS->new(reactor => $self->reactor);
+    $tls->on(finish => sub { $self->emit(accept => pop) });
+    $tls->on(error => sub { });
     $tls->negotiate(%$args, handle => $handle, server => 1);
   }
 }

diff --git a/lib/Mojo/IOLoop/TLS.pm b/lib/Mojo/IOLoop/TLS.pm
@@ -3,7 +3,6 @@ use Mojo::Base 'Mojo::EventEmitter';
 
 use Exporter 'import';
 use Mojo::File 'path';
-use Scalar::Util 'weaken';
 
 # TLS support requires IO::Socket::SSL
 use constant HAS_TLS => $ENV{MOJO_NO_TLS}
@@ -33,7 +32,6 @@ sub negotiate {
   return $self->emit(error => 'IO::Socket::SSL 1.94+ required for TLS support')
     unless HAS_TLS;
 
-  weaken $self;
   my $tls = {
     SSL_ca_file => $args->{tls_ca}
       && -T $args->{tls_ca} ? $args->{tls_ca} : undef,