Commit: 31385ce7e487689efdeb274fc052d57c07ca3ad4 - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revision: 31385ce7e487689efdeb274fc052d57c07ca3ad4 (tree)
• Time: 2011-10-28 19:33:57
• Author: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Change behavior of checking closed sockets for some Windows 2000 environments.

Change Summary

• modified: FFFTP_Eng_Release/FFFTP.exe
• modified: Release/FFFTP.exe
• modified: socket.c

Incremental Difference

Binary files a/FFFTP_Eng_Release/FFFTP.exe and b/FFFTP_Eng_Release/FFFTP.exe differ

Binary files a/Release/FFFTP.exe and b/Release/FFFTP.exe differ

--- a/socket.c
+++ b/socket.c
@@ -992,7 +992,7 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *Cance
 			if(Ret != SOCKET_ERROR)
 				break;
 			// 何故か一部のホストとWindows 2000の組み合わせで通信できないバグに暫定対応
-			if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
+			if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES && recvS(s, buf, len, MSG_PEEK) <= 0)
 				break;
 			Error = WSAGetLastError();
 			Sleep(1);