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

merges r24367 from trunk into ruby_1_9_1.

Browse source 
--
	* win32/win32.c (rb_w32_connect): return value was broken when some
	  error occurred.
	  [ruby-core:24234]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2009-08-08 15:32:23 +00:00
parent 7ad4bd137d
commit 2fd6766226
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Aug 3 16:28:09 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_connect): return value was broken when some
error occurred.
[ruby-core:24234]
Mon Aug 3 15:48:40 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_{permutation,combination}): disallow reentrance

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
#define RUBY_PATCHLEVEL 264
#define RUBY_PATCHLEVEL 265
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1

11
win32/win32.c
View file

@ -2394,14 +2394,11 @@ rb_w32_connect(int s, const struct sockaddr *addr, int addrlen)
RUBY_CRITICAL({
r = connect(TO_SOCKET(s), addr, addrlen);
if (r == SOCKET_ERROR) {
r = WSAGetLastError();
if (r != WSAEWOULDBLOCK) {
errno = map_errno(r);
}
else {
int err = WSAGetLastError();
if (err != WSAEWOULDBLOCK)
errno = map_errno(err);
else
errno = EINPROGRESS;
r = -1;
}
}
});
return r;