More AnyEvent "Surprise! You're screwed!" workarounds

sanko · Aug 27, 2010 · e1d0694 · e1d0694
1 parent 2a652fb
commit e1d0694
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Net/BitTorrent/Protocol/BEP03/Peer.pm b/lib/Net/BitTorrent/Protocol/BEP03/Peer.pm
@@ -155,12 +155,12 @@
         ddx $p;
     }
     override 'disconnect' => sub {
-        super;
-        my $s = shift;
+        my ($s) = @_;
         if (!$s->_handle->destroyed) {
-            $s->_handle->push_shutdown if defined $s->_handle->{'fh'};
+            $s->_handle->push_shutdown;
             $s->_handle->destroy;
         }
+        super;
     };
 
     # Outgoing packets

diff --git a/lib/Net/BitTorrent/Protocol/BEP03/Peer/Outgoing.pm b/lib/Net/BitTorrent/Protocol/BEP03/Peer/Outgoing.pm
@@ -77,8 +77,12 @@
                     return if !defined $s;
                     $s->_send_handshake;
                 },
-                on_read => sub {
+                on_eof => sub {
                     return if !defined $s;
+                    $s->_handle->push_shutdown;
+                    $s->_handle->destroy;
+                },
+                on_read => sub {
                     require Net::BitTorrent::Protocol::BEP03::Packets;
                 PACKET:
                     while (