From 247caa48ea1f6f16622ad384fcaefb488de04c56 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 23 Aug 2011 13:07:24 +0000 Subject: * fhandler_socket.cc (fhandler_socket::send_internal): Fix setting nosignal flag. Convert ECONNABORTED on connection-oriented socket to EPIPE, too. --- winsup/cygwin/ChangeLog | 6 ++++++ winsup/cygwin/fhandler_socket.cc | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 73e6dd4..d959184 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,9 @@ +2011-08-23 Corinna Vinschen + + * fhandler_socket.cc (fhandler_socket::send_internal): Fix setting + nosignal flag. Convert ECONNABORTED on connection-oriented socket + to EPIPE, too. + 2011-08-21 Christopher Faylor * dtable.cc (conv_start_chars): Remove unneeded section attribute. diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc index 72669c5..30c7237 100644 --- a/winsup/cygwin/fhandler_socket.cc +++ b/winsup/cygwin/fhandler_socket.cc @@ -1585,7 +1585,7 @@ fhandler_socket::send_internal (struct _WSAMSG *wsamsg, int flags) WSABUF buf; bool use_sendmsg = false; DWORD wait_flags = flags & MSG_DONTWAIT; - bool nosignal = !(flags & MSG_NOSIGNAL); + bool nosignal = !!(flags & MSG_NOSIGNAL); flags &= (MSG_OOB | MSG_DONTROUTE); if (wsamsg->Control.len > 0) @@ -1648,7 +1648,8 @@ fhandler_socket::send_internal (struct _WSAMSG *wsamsg, int flags) EPIPE is generated if the local end has been shut down on a connection oriented socket. In this case the process will also receive a SIGPIPE unless MSG_NOSIGNAL is set. */ - if (get_errno () == ESHUTDOWN && get_socket_type () == SOCK_STREAM) + if ((get_errno () == ECONNABORTED || get_errno () == ESHUTDOWN) + && get_socket_type () == SOCK_STREAM) { set_errno (EPIPE); if (!nosignal) -- cgit v1.1