kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to fix aix problem

Browse Source
This commit is contained in:
Andy Cedilnik 2003-01-16 13:02:11 -05:00
parent 5dfa7ed590
commit 0488236e3a
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Source/CTest/cmCTestSubmit.cxx
View File

@ -291,31 +291,31 @@ bool cmCTestSubmit::TriggerUsingHTTP(const std::vector<std::string>& files,
/* In windows, this will init the winsock stuff */ /* In windows, this will init the winsock stuff */
::curl_global_init(CURL_GLOBAL_ALL); ::curl_global_init(CURL_GLOBAL_ALL);
/* get a curl handle */ std::string::size_type cc, kk;
curl = curl_easy_init(); for ( cc = 0; cc < files.size(); cc ++ )
if(curl)
{ {
// Using proxy /* get a curl handle */
if ( m_HTTPProxyType > 0 ) curl = curl_easy_init();
if(curl)
{ {
curl_easy_setopt(curl, CURLOPT_PROXY, m_HTTPProxy.c_str()); // Using proxy
switch (m_HTTPProxyType) if ( m_HTTPProxyType > 0 )
{ {
case 2: curl_easy_setopt(curl, CURLOPT_PROXY, m_HTTPProxy.c_str());
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4); switch (m_HTTPProxyType)
break; {
case 3: case 2:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5); curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
break; break;
default: case 3:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
break;
default:
curl_easy_setopt(curl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP);
}
} }
}
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1); curl_easy_setopt(curl, CURLOPT_VERBOSE, 1);
std::string::size_type cc, kk;
for ( cc = 0; cc < files.size(); cc ++ )
{
std::string file = remoteprefix + files[cc]; std::string file = remoteprefix + files[cc];
std::string ofile = ""; std::string ofile = "";
for ( kk = 0; kk < file.size(); kk ++ ) for ( kk = 0; kk < file.size(); kk ++ )
@ -352,9 +352,9 @@ bool cmCTestSubmit::TriggerUsingHTTP(const std::vector<std::string>& files,
::curl_global_cleanup(); ::curl_global_cleanup();
return false; return false;
} }
// always cleanup
::curl_easy_cleanup(curl);
} }
// always cleanup
::curl_easy_cleanup(curl);
} }
::curl_global_cleanup(); ::curl_global_cleanup();
return true; return true;