1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input,

Browse Source 
because POSIX platforms just do so.  fixes test errors revealed by
  r52647.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-11-19 04:59:50 +00:00
parent 8a3423d38b
commit 01a54cf40f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Nov 19 13:57:58 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input,
because POSIX platforms just do so. fixes test errors revealed by
r52647.
Thu Nov 19 02:52:30 2015 NAKAMURA Usaku <usa@ruby-lang.org> Thu Nov 19 02:52:30 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size * ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size

7
win32/win32.c
View File

@ -3276,8 +3276,13 @@ finish_overlapped_socket(BOOL input, SOCKET s, WSAOVERLAPPED *wol, int result, D
default: default:
if ((err = WSAGetLastError()) == WSAECONNABORTED && !input) if ((err = WSAGetLastError()) == WSAECONNABORTED && !input)
errno = EPIPE; errno = EPIPE;
else if (err == WSAEMSGSIZE && input) {
result = TRUE;
*len = size;
break;
}
else else
errno = map_errno(WSAGetLastError()); errno = map_errno(err);
/* thru */ /* thru */
case WAIT_OBJECT_0 + 1: case WAIT_OBJECT_0 + 1:
/* interrupted */ /* interrupted */