mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
changes at 2004-09-07. [ruby-dev:26656] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f362749fac
commit
5ddbcc5de4
2 changed files with 6 additions and 6 deletions
|
@ -1,7 +1,12 @@
|
|||
Wed Aug 3 08:22:13 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]
|
||||
changes at 2004-09-07. [ruby-dev:26656]
|
||||
|
||||
Wed Aug 3 06:53:35 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* array.c (rb_ary_or): wraps the operand in an array if it is not
|
||||
an array. [ruby-talk:150495]
|
||||
an array. [ruby-talk:150495] [EXPERIMENTAL]
|
||||
|
||||
* array.c (rb_ary_and, rb_ary_plus, rb_ary_diff): ditto.
|
||||
|
||||
|
|
|
@ -1012,9 +1012,7 @@ ruby_connect(fd, sockaddr, len, socks)
|
|||
int socks;
|
||||
{
|
||||
int status;
|
||||
#if defined(HAVE_FCNTL)
|
||||
int mode;
|
||||
#endif
|
||||
#if WAIT_IN_PROGRESS > 0
|
||||
int wait_in_progress = -1;
|
||||
int sockerr, sockerrlen;
|
||||
|
@ -1058,9 +1056,6 @@ ruby_connect(fd, sockaddr, len, socks)
|
|||
#ifdef EINPROGRESS
|
||||
case EINPROGRESS:
|
||||
#endif
|
||||
#if defined(HAVE_FCNTL)
|
||||
if (mode & NONBLOCKING) break;
|
||||
#endif
|
||||
#if WAIT_IN_PROGRESS > 0
|
||||
sockerrlen = sizeof(sockerr);
|
||||
status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
|
||||
|
|
Loading…
Reference in a new issue