From 367043eb137db380b04e855175a33a480afb9007 Mon Sep 17 00:00:00 2001
From: s_kawamoto <s_kawamoto@users.sourceforge.jp>
Date: Fri, 28 Oct 2011 19:12:16 +0900
Subject: [PATCH] Change behavior of checking closed sockets for some Windows
 2000 environments.

---
 FFFTP_Eng_Release/FFFTP.exe | Bin 550912 -> 550912 bytes
 Release/FFFTP.exe           | Bin 548352 -> 548352 bytes
 socket.c                    |  12 ++++++------
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FFFTP_Eng_Release/FFFTP.exe b/FFFTP_Eng_Release/FFFTP.exe
index 4d0ded34e1a794a353d1b12a2c11e4f38f310d89..d4daca44469bc2dc44666248f27215a49e206455 100644
GIT binary patch
delta 156
zcmZp;pxAIhaRDRKo%&`b#&#w~5M}~m=Iu<3EJx=WW-;}K{s`)J<p_9j>gWIe%}02e
ze=wG^zFg11!0=+PHv>bb>yIqP|Drk$ZVWG8xc&RT{l`2O4<=-Nf#1>fxp<=L%Xj(r
UzrAoF3lOscG28aSh3x&u0RFK-J^%m!

delta 156
zcmZp;pxAIhaRDP!PE9itV>=Tg2r~gO^L8dimZNhGU)=O&VCZ!Hk;V95RL8-M;RTEP
zzyHlY7)x1Su3=zc$YSaZ{Snmd$`SBl_0RwRn~(5p|1pongURqkf+woJZWkQ-jJ|{Q
UwHGdA0b*7lX4_u4kiGvH02~)T_y7O^

diff --git a/Release/FFFTP.exe b/Release/FFFTP.exe
index 41fabe1b0f92ca7afa79d02507bb138d7ff2db44..ebd738355fa53c970d56b5a956e758f4f2d64932 100644
GIT binary patch
delta 156
zcmZqJqu8)VaRDRKo%&`b#&#w~5M}~m=Iu<3EJx=WW-;}K{s`)J<p_9j>gWIe%}02e
ze=wG^zFg11!0=+PHv>bb>yIqP|Drk$ZVWG8xc&RT{l`2O4<=-Nf#1>fxp<=L%Xj(r
UzrAoF3lOscG28aSh3x%%0OqSf3;+NC

delta 156
zcmZqJqu8)VaRDP!RZTM!V>=Tg2r~gO^L8dimZNhGU)=O&VCZ!Hk;V95RL8-M;RTEP
zzyHlY7)x1Su3=zc$YSaZ{Snmd$`SBl_0RwRn~(5p|1pongURqkf+woJZWkQ-jJ|{Q
UwHGdA0b*7lX4_u4kiCBo01O*H)Bpeg

diff --git a/socket.c b/socket.c
index f2b63f6..1b5379d 100644
--- a/socket.c
+++ b/socket.c
@@ -991,13 +991,13 @@ int do_recv(SOCKET s, char *buf, int len, int flags, int *TimeOutErr, int *Cance
 			Ret = recvS(s, buf, len, flags);
 			if(Ret != SOCKET_ERROR)
 				break;
+			// 何故か一部のホストとWindows 2000の組み合わせで通信できないバグに暫定対応
+			if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
+				break;
 			Error = WSAGetLastError();
 			Sleep(1);
 			if(BackgrndMessageProc() == YES)
 				break;
-			// 何故か一部のホストとWindows 2000の組み合わせで通信できないバグに暫定対応
-			if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
-				break;
 			// FTPS対応
 			// 受信確認をバイパスしたためここでタイムアウトの確認
 			if(BackgrndMessageProc() == YES)
@@ -1104,13 +1104,13 @@ int do_send(SOCKET s, const char *buf, int len, int flags, int *TimeOutErr, int
 #endif
 				break;
 			}
+			// 何故か一部のホストとWindows 2000の組み合わせで通信できないバグに暫定対応
+			if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
+				break;
 			Error = WSAGetLastError();
 			Sleep(1);
 			if(BackgrndMessageProc() == YES)
 				break;
-			// 何故か一部のホストとWindows 2000の組み合わせで通信できないバグに暫定対応
-			if(AskAsyncDone(s, &Error, FD_CLOSE_BIT) == YES)
-				break;
 			// FTPS対応
 			// 送信バッファ確認をバイパスしたためここでタイムアウトの確認
 			if(BackgrndMessageProc() == YES)
-- 
2.11.0