Skip to content

Commit

Permalink
* win32/win32.c (finish_overlapped_socket): ignore EMSGSIZE when input,
Browse files Browse the repository at this point in the history
  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
  • Loading branch information
unak committed Nov 19, 2015
1 parent 8a3423d commit 01a54cf
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
6 changes: 6 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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>

* ext/socket/ancdata.c (bsock_recvmsg_internal): stretch the buffer size
Expand Down
7 changes: 6 additions & 1 deletion win32/win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 01a54cf

Please sign in to comment.