From 6ba3f6bb2d088c7b5ffc84a6ed74ad3d525fde37 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sun, 13 Nov 2005 16:24:40 +0000 Subject: * fhandler_socket.cc (fhandler_socket::recvfrom): Just return 0 (EOF) in case of WSAESHUTDOWN. (fhandler_socket::recvmsg): Ditto. * poll.cc (poll): Set revents to POLLIN instead of POLLHUP. Add comment. --- winsup/cygwin/fhandler_socket.cc | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'winsup/cygwin/fhandler_socket.cc') diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 79b59ff9b..5ed7d041a 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1061,6 +1061,11 @@ fhandler_socket::recvfrom (void *ptr, size_t len, int flags, if (WSAGetLastError () == WSAEMSGSIZE) return len; + /* ESHUTDOWN isn't defined for recv in SUSv3. Simply EOF is returned + in this case. */ + if (WSAGetLastError () == WSAESHUTDOWN) + return 0; + set_winsock_errno (); } else @@ -1142,6 +1147,11 @@ fhandler_socket::recvmsg (struct msghdr *msg, int flags, ssize_t tot) if (WSAGetLastError () == WSAEMSGSIZE) return len; + /* ESHUTDOWN isn't defined for recv in SUSv3. Simply EOF is returned + in this case. */ + if (WSAGetLastError () == WSAESHUTDOWN) + return 0; + set_winsock_errno (); } else -- cgit v1.2.3