From 2583078951f14a2df251ba7c27310f62e69269ad Mon Sep 17 00:00:00 2001 From: nagachika Date: Sat, 22 Feb 2014 04:17:51 +0000 Subject: merge revision(s) r45084: [Backport #9547] * ext/socket/init.c (wait_connectable): break if the socket is writable to avoid infinite loops on FreeBSD and other platforms which conforms to SUSv3. This problem cannot be reproduced with loopback interfaces, so it's hard to write test code. rsock_connect() and wait_connectable() are overly complicated, so they should be refactored, but I commit this fix as a workaround for the release of Ruby 1.9.3 scheduled on Feb 24. [ruby-core:60940] [Bug #9547] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/init.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/socket/init.c b/ext/socket/init.c index 9999c02969..53f946044a 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -314,8 +314,12 @@ wait_connectable(int fd) */ if (ret < 0) break; - if (sockerr == 0) - continue; /* workaround for winsock */ + if (sockerr == 0) { + if (revents & RB_WAITFD_OUT) + break; + else + continue; /* workaround for winsock */ + } /* BSD and Linux use sockerr. */ errno = sockerr; -- cgit v1.2.3