From 281f4896783f605234cf918fe86162c377f4023a Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sun, 16 Jan 2011 08:08:44 +0000 Subject: [PATCH] - attempt to make FTP transfers more efficient by turning off epsv since feathery doesn't support it --- source/shared_lib/sources/platform/posix/miniftpclient.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/shared_lib/sources/platform/posix/miniftpclient.cpp b/source/shared_lib/sources/platform/posix/miniftpclient.cpp index 116e29400..6d5ae92dc 100644 --- a/source/shared_lib/sources/platform/posix/miniftpclient.cpp +++ b/source/shared_lib/sources/platform/posix/miniftpclient.cpp @@ -256,6 +256,8 @@ FTP_Client_ResultType FTPClientThread::getMapFromServer(string mapFileName, stri sprintf(szBuf,"ftp://%s:%s@%s:%d/%s%s",ftpUser.c_str(),ftpUserPassword.c_str(),serverUrl.c_str(),portNumber,mapFileName.c_str(),destFileExt.c_str()); curl_easy_setopt(curl, CURLOPT_URL,szBuf); + curl_easy_setopt(curl, CURLOPT_FTP_USE_EPSV, 0L); + /* Define our callback to get called when there's data to be written */ curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite); /* Set a pointer to our struct to pass to the callback */ @@ -403,6 +405,7 @@ FTP_Client_ResultType FTPClientThread::getTilesetFromServer(string tileSetName, } curl_easy_setopt(curl, CURLOPT_URL,szBuf); + curl_easy_setopt(curl, CURLOPT_FTP_USE_EPSV, 0L); // turn on wildcard matching curl_easy_setopt(curl, CURLOPT_WILDCARDMATCH, 1L);