aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llxmlrpctransaction.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:42 -0500
committerJacek Antonelli2008-08-15 23:45:42 -0500
commitce28e056c20bf2723f565bbf464b87781ec248a2 (patch)
treeef7b0501c4de4b631a916305cbc2a5fdc125e52d /linden/indra/newview/llxmlrpctransaction.cpp
parentSecond Life viewer sources 1.19.1.4b (diff)
downloadmeta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.zip
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.gz
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.bz2
meta-impy-ce28e056c20bf2723f565bbf464b87781ec248a2.tar.xz
Second Life viewer sources 1.20.2
Diffstat (limited to 'linden/indra/newview/llxmlrpctransaction.cpp')
-rw-r--r--linden/indra/newview/llxmlrpctransaction.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index bc10c1b..7179104 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -238,8 +238,9 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
238// mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging 238// mCurlRequest->setopt(CURLOPT_VERBOSE, 1); // usefull for debugging
239 mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1); 239 mCurlRequest->setopt(CURLOPT_NOSIGNAL, 1);
240 mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this); 240 mCurlRequest->setWriteCallback(&curlDownloadCallback, (void*)this);
241 mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, gVerifySSLCert); 241 BOOL vefifySSLCert = !gSavedSettings.getBOOL("NoVerifySSLCert");
242 mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, gVerifySSLCert? 2 : 0); 242 mCurlRequest->setopt(CURLOPT_SSL_VERIFYPEER, vefifySSLCert);
243 mCurlRequest->setopt(CURLOPT_SSL_VERIFYHOST, vefifySSLCert ? 2 : 0);
243 // Be a little impatient about establishing connections. 244 // Be a little impatient about establishing connections.
244 mCurlRequest->setopt(CURLOPT_CONNECTTIMEOUT, 40L); 245 mCurlRequest->setopt(CURLOPT_CONNECTTIMEOUT, 40L);
245 246