Revert "Possible fix for "No able to connect to SecondLife""
This reverts commit 66c95af093.
This commit is contained in:
@@ -501,9 +501,6 @@ void LLCurl::Easy::prepRequest(const std::string& url,
|
||||
if (post) setoptString(CURLOPT_ENCODING, "");
|
||||
|
||||
//setopt(CURLOPT_VERBOSE, 1); // useful for debugging
|
||||
#ifndef CURLTHREADING_BRANCH
|
||||
setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
|
||||
#endif
|
||||
setopt(CURLOPT_NOSIGNAL, 1);
|
||||
|
||||
// Set the CURL options for either Socks or HTTP proxy
|
||||
|
||||
@@ -441,9 +441,6 @@ static LLSD blocking_request(
|
||||
LLProxy::getInstance()->applyProxySettings(curlp);
|
||||
|
||||
// * Set curl handle options
|
||||
#ifndef CURLTHREADING_BRANCH
|
||||
curl_easy_setopt(curlp, CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
|
||||
#endif
|
||||
curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1); // don't use SIGALRM for timeouts
|
||||
curl_easy_setopt(curlp, CURLOPT_TIMEOUT, timeout); // seconds, see warning at top of function.
|
||||
curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, LLHTTPBuffer::curl_write);
|
||||
|
||||
@@ -471,9 +471,6 @@ void LLURLRequest::initialize()
|
||||
return ;
|
||||
}
|
||||
|
||||
#ifndef CURLTHREADING_BRANCH
|
||||
mDetail->mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
|
||||
#endif
|
||||
mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
|
||||
mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
|
||||
mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);
|
||||
|
||||
@@ -325,9 +325,6 @@ int HippoRestRequest::getBlocking(const std::string &url, std::string *result)
|
||||
char curlErrorBuffer[CURL_ERROR_SIZE];
|
||||
CURL* curlp = curl_easy_init();
|
||||
|
||||
#ifndef CURLTHREADING_BRANCH
|
||||
curl_easy_setopt(curlp, CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
|
||||
#endif
|
||||
curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1); // don't use SIGALRM for timeouts
|
||||
curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5); // seconds
|
||||
curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str());
|
||||
|
||||
@@ -240,9 +240,6 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
|
||||
LLProxy::getInstance()->applyProxySettings(mCurlRequest);
|
||||
|
||||
// mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
|
||||
#ifndef CURLTHREADING_BRANCH
|
||||
mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
|
||||
#endif
|
||||
mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
|
||||
mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
|
||||
BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");
|
||||
|
||||
Reference in New Issue
Block a user