From 01a54cf40faa7eac714eea2f92c4cbfd76a52ca7 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 19 Nov 2015 04:59:50 +0000 Subject: [PATCH] * win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input, 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 --- ChangeLog | 6 ++++++ win32/win32.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a977e3eea4..299a69a266 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Nov 19 13:57:58 2015 NAKAMURA Usaku + + * 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 * ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size diff --git a/win32/win32.c b/win32/win32.c index 953c916c93..6ebd9e433c 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3276,8 +3276,13 @@ finish_overlapped_socket(BOOL input, SOCKET s, WSAOVERLAPPED *wol, int result, D default: if ((err = WSAGetLastError()) == WSAECONNABORTED && !input) errno = EPIPE; + else if (err == WSAEMSGSIZE && input) { + result = TRUE; + *len = size; + break; + } else - errno = map_errno(WSAGetLastError()); + errno = map_errno(err); /* thru */ case WAIT_OBJECT_0 + 1: /* interrupted */