improved error handling in Mojo::IOLoop::Client

mojolicious · Nov 5, 2014 · 46edc0f · 46edc0f
1 parent df0d57f
commit 46edc0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
-5.58  2014-11-04
+5.58  2014-11-05
+  - Improved error handling in Mojo::IOLoop::Client.
 
 5.57  2014-11-02
   - Deprecated stringification support in Mojo::Collection.

diff --git a/lib/Mojo/IOLoop/Client.pm b/lib/Mojo/IOLoop/Client.pm
@@ -5,7 +5,7 @@ use Errno 'EINPROGRESS';
 use IO::Socket::INET;
 use Mojo::IOLoop;
 use Scalar::Util 'weaken';
-use Socket qw(IPPROTO_TCP SO_ERROR TCP_NODELAY);
+use Socket qw(IPPROTO_TCP TCP_NODELAY);
 
 # IPv6 support requires IO::Socket::IP
 use constant IPV6 => $ENV{MOJO_NO_IPV6}
@@ -81,8 +81,7 @@ sub _ready {
   my $handle = $self->{handle};
   return $! == EINPROGRESS ? undef : $self->emit(error => $!)
     if $handle->isa('IO::Socket::IP') && !$handle->connect;
-  return $self->emit(error => $! = $handle->sockopt(SO_ERROR))
-    unless $handle->connected;
+  return $self->emit(error => $! || 'Not connected') unless $handle->connected;
 
   # Disable Nagle's algorithm
   setsockopt $handle, IPPROTO_TCP, TCP_NODELAY, 1;