kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/socket.c (ruby_connect): revert [ruby-talk:111654]

Browse source 
changes at 2004-09-07.  [ruby-dev:26656]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2005-08-02 23:25:35 +00:00
parent fdd8dcc93d
commit 0d4264f717
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
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]
Tue Aug 2 10:20:54 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* ext/tcltklib/tcltklib.c: use Tcl_[GS]etVar2Ex instead of

8
ext/socket/socket.c
View file

@ -875,7 +875,8 @@ static int
wait_connectable(fd)
int fd;
{
int sockerr, sockerrlen;
int sockerr;
socklen_t sockerrlen;
fd_set fds_w;
fd_set fds_e;
@ -929,9 +930,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;
@ -975,9 +974,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);