Commit: 391e3074b3447b3a0d5f9153eb82cb87c89dfede - ffftp (git)

FFFTPのソースコードです。

Commit MetaInfo

• Revisión: 391e3074b3447b3a0d5f9153eb82cb87c89dfede (tree)
• Tiempo: 2011-10-13 21:15:23
• Autor: s_kawamoto <s_kawamoto@user...>
• Commiter: s_kawamoto

Log Message

Fix bugs of timeout of FTPS negotiation.

Cambiar Resumen

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

Diferencia incremental

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/socketwrapper.c
+++ b/socketwrapper.c
@@ -189,7 +189,7 @@ BOOL AttachSSL(SOCKET s)
 					while(pSSL_connect(*ppSSL) != 1)
 					{
 						LeaveCriticalSection(&g_OpenSSLLock);
-						if(g_pOpenSSLTimeoutCallback() || timeGetTime() - Time >= g_OpenSSLTimeout)
+						if(g_pOpenSSLTimeoutCallback() || (g_OpenSSLTimeout > 0 && timeGetTime() - Time >= g_OpenSSLTimeout))
 						{
 							DetachSSL(s);
 							r = FALSE;