--------------------- PatchSet 5886 Date: 2003/08/18 15:38:57 Author: serassio Branch: nt-2_5 Tag: (none) Log: Removed an experiment on socket handling Members: port/win32/include/squid-mswin.h:1.1.2.18->1.1.2.19 Index: squid/port/win32/include/squid-mswin.h =================================================================== RCS file: /cvsroot/squid-sf//squid/port/win32/include/Attic/squid-mswin.h,v retrieving revision 1.1.2.18 retrieving revision 1.1.2.19 diff -u -r1.1.2.18 -r1.1.2.19 --- squid/port/win32/include/squid-mswin.h 17 Aug 2003 12:32:16 -0000 1.1.2.18 +++ squid/port/win32/include/squid-mswin.h 18 Aug 2003 15:38:57 -0000 1.1.2.19 @@ -1,5 +1,5 @@ /* - * $Id: squid-mswin.h,v 1.1.2.18 2003/08/17 12:32:16 serassio Exp $ + * $Id: squid-mswin.h,v 1.1.2.19 2003/08/18 15:38:57 serassio Exp $ * * AUTHOR: Guido Serassio & Andrey Shorin * @@ -282,12 +282,10 @@ (errno = WSAGetLastError()), -1 : ws32_result) #define recv(s,b,l,f) \ (SOCKET_ERROR == (ws32_result = recv(_get_osfhandle(s),b,l,f)) ? \ - (errno = WSAGetLastError()), (((errno == WSAESHUTDOWN) || (errno == WSAECONNABORTED) \ - || (errno == WSAECONNRESET)) ? 0 : -1) : ws32_result) + (errno = WSAGetLastError()), -1 : ws32_result) #define recvfrom(s,b,l,f,fr,frl) \ (SOCKET_ERROR == (ws32_result = recvfrom(_get_osfhandle(s),b,l,f,fr,frl)) ? \ - (errno = WSAGetLastError()), (((errno == WSAESHUTDOWN) || (errno == WSAECONNABORTED) \ - || (errno == WSAECONNRESET)) ? 0 : -1) : ws32_result) + (errno = WSAGetLastError()), -1 : ws32_result) #define send(s,b,l,f) \ (SOCKET_ERROR == (ws32_result = send(_get_osfhandle(s),b,l,f)) ? \ (errno = WSAGetLastError()), -1 : ws32_result)