Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-07-14 22:02:06 +02:00
parent cb61342e58 66c95af093
commit 0caa321fe5
6 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llmessage/llcurl.cpp
View File

@@ -501,6 +501,9 @@ void LLCurl::Easy::prepRequest(const std::string& url,
if (post) setoptString(CURLOPT_ENCODING, ""); if (post) setoptString(CURLOPT_ENCODING, "");
//setopt(CURLOPT_VERBOSE, 1); // useful for debugging //setopt(CURLOPT_VERBOSE, 1); // useful for debugging
#ifndef CURLTHREADING_BRANCH
setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
#endif
setopt(CURLOPT_NOSIGNAL, 1); setopt(CURLOPT_NOSIGNAL, 1);
// Set the CURL options for either Socks or HTTP proxy // Set the CURL options for either Socks or HTTP proxy

3
indra/llmessage/llhttpclient.cpp
View File

@@ -441,6 +441,9 @@ static LLSD blocking_request(
LLProxy::getInstance()->applyProxySettings(curlp); LLProxy::getInstance()->applyProxySettings(curlp);
// * Set curl handle options // * 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_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_TIMEOUT, timeout); // seconds, see warning at top of function.
curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, LLHTTPBuffer::curl_write); curl_easy_setopt(curlp, CURLOPT_WRITEFUNCTION, LLHTTPBuffer::curl_write);

3
indra/llmessage/llurlrequest.cpp
View File

@@ -471,6 +471,9 @@ void LLURLRequest::initialize()
return ; return ;
} }
#ifndef CURLTHREADING_BRANCH
mDetail->mCurlRequest->setopt(CURLOPT_SSLVERSION, (long)CURL_SSLVERSION_TLSv1);
#endif
mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1); mDetail->mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this); mDetail->mCurlRequest->setWriteCallback(&downCallback, (void*)this);
mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this); mDetail->mCurlRequest->setReadCallback(&upCallback, (void*)this);

3
indra/newview/hipporestrequest.cpp
View File

@@ -325,6 +325,9 @@ int HippoRestRequest::getBlocking(const std::string &url, std::string *result)
char curlErrorBuffer[CURL_ERROR_SIZE]; char curlErrorBuffer[CURL_ERROR_SIZE];
CURL* curlp = curl_easy_init(); 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_NOSIGNAL, 1); // don't use SIGALRM for timeouts
curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5); // seconds curl_easy_setopt(curlp, CURLOPT_TIMEOUT, 5); // seconds
curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str()); curl_easy_setopt(curlp, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str());

3
indra/newview/llxmlrpctransaction.cpp
View File

@@ -240,6 +240,9 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
LLProxy::getInstance()->applyProxySettings(mCurlRequest); LLProxy::getInstance()->applyProxySettings(mCurlRequest);
// mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging // 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->setopt(CURLOPT_NOSIGNAL, 1);
mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this); mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert"); BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");

2
indra/plugins/webkit/media_plugin_webkit.cpp
View File

@@ -25,8 +25,8 @@
* $/LicenseInfo$ * $/LicenseInfo$
* @endcond * @endcond
*/ */
#include "llqtwebkit.h"
#include "linden_common.h" #include "linden_common.h"
#include "llqtwebkit.h"
#include "indra_constants.h" // for indra keyboard codes #include "indra_constants.h" // for indra keyboard codes
#include "lltimer.h" #include "lltimer.h"