diff options
| author | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-21 14:59:44 +0000 |
|---|---|---|
| committer | shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-02-21 14:59:44 +0000 |
| commit | 139d06c34f4d51147a5d7707e738878b1fda65bf (patch) | |
| tree | c13d4fe803cf8170d8fa7053330f4df2c9996d88 | |
| parent | 6337bf7588754c2f17e044fcf3238aa36f504469 (diff) | |
| download | ruby-139d06c34f4d51147a5d7707e738878b1fda65bf.tar.gz | |
* 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/trunk@45084 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ext/socket/init.c | 8 |
2 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,14 @@ +Fri Feb 21 23:47:24 2014 Shugo Maeda <shugo@ruby-lang.org> + + * 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] + Fri Feb 21 23:03:39 2014 NARUSE, Yui <naruse@ruby-lang.org> * tool/redmine-backporter.rb: added to handle redmine tickets. diff --git a/ext/socket/init.c b/ext/socket/init.c index dc6b531bd6..f6cd2bce7b 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -364,8 +364,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; |