diff options
| author | ferrieux <ferrieux@users.sourceforge.net> | 2009-04-27 21:25:17 (GMT) |
|---|---|---|
| committer | ferrieux <ferrieux@users.sourceforge.net> | 2009-04-27 21:25:17 (GMT) |
| commit | 6f574c6fa9dc0713fbf6f7292b5b4261378243de (patch) | |
| tree | 08153556a85dbd59d13dd57e65bd1071abae6a37 /win | |
| parent | 8c1b9fa15fdb1b02f78973bc19b361a2fc5acad9 (diff) | |
| download | tcl-6f574c6fa9dc0713fbf6f7292b5b4261378243de.zip tcl-6f574c6fa9dc0713fbf6f7292b5b4261378243de.tar.gz tcl-6f574c6fa9dc0713fbf6f7292b5b4261378243de.tar.bz2 | |
Backport fix for [Bug 2446662]: resync Win behavior on RST with that of unix (EOF).
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinSock.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/win/tclWinSock.c b/win/tclWinSock.c index eb1ee84..1053d4d 100644 --- a/win/tclWinSock.c +++ b/win/tclWinSock.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinSock.c,v 1.36.2.8 2007/11/29 00:31:51 hobbs Exp $ + * RCS: @(#) $Id: tclWinSock.c,v 1.36.2.9 2009/04/27 21:25:18 ferrieux Exp $ */ #include "tclWinInt.h" @@ -1769,11 +1769,23 @@ TcpInputProc(instanceData, buf, toRead, errorCodePtr) break; } + error = winSock.WSAGetLastError(); + + /* + * If an RST comes, then ignore the error and report an EOF just like + * on unix. + */ + + if (error == WSAECONNRESET) { + infoPtr->flags |= SOCKET_EOF; + bytesRead = 0; + break; + } + /* * Check for error condition or underflow in non-blocking case. */ - error = winSock.WSAGetLastError(); if ((infoPtr->flags & SOCKET_ASYNC) || (error != WSAEWOULDBLOCK)) { TclWinConvertWSAError(error); *errorCodePtr = Tcl_GetErrno(); |