aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llxmlrpctransaction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llxmlrpctransaction.cpp')
-rw-r--r--linden/indra/newview/llxmlrpctransaction.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/linden/indra/newview/llxmlrpctransaction.cpp b/linden/indra/newview/llxmlrpctransaction.cpp
index 896508c..887b69d 100644
--- a/linden/indra/newview/llxmlrpctransaction.cpp
+++ b/linden/indra/newview/llxmlrpctransaction.cpp
@@ -228,22 +228,22 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
228 228
229 // tell curl about the settings 229 // tell curl about the settings
230 curl_easy_setopt(mCurl, CURLOPT_PROXY, mProxyAddress.c_str()); 230 curl_easy_setopt(mCurl, CURLOPT_PROXY, mProxyAddress.c_str());
231 curl_easy_setopt(mCurl, CURLOPT_PROXYPORT, (long)port); 231 curl_easy_setopt(mCurl, CURLOPT_PROXYPORT, (long) port);
232 curl_easy_setopt(mCurl, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); 232 curl_easy_setopt(mCurl, CURLOPT_PROXYTYPE, (long) CURLPROXY_HTTP);
233 }; 233 };
234 234
235// curl_easy_setopt(mCurl, CURLOPT_VERBOSE, 1); // usefull for debugging 235// curl_easy_setopt(mCurl, CURLOPT_VERBOSE, 1L); // usefull for debugging
236 curl_easy_setopt(mCurl, CURLOPT_NOSIGNAL, 1); 236 curl_easy_setopt(mCurl, CURLOPT_NOSIGNAL, 1L);
237 curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, &curlDownloadCallback); 237 curl_easy_setopt(mCurl, CURLOPT_WRITEFUNCTION, &curlDownloadCallback);
238 curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, this); 238 curl_easy_setopt(mCurl, CURLOPT_WRITEDATA, this);
239 curl_easy_setopt(mCurl, CURLOPT_ERRORBUFFER, &mCurlErrorBuffer); 239 curl_easy_setopt(mCurl, CURLOPT_ERRORBUFFER, &mCurlErrorBuffer);
240 curl_easy_setopt(mCurl, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str()); 240 curl_easy_setopt(mCurl, CURLOPT_CAINFO, gDirUtilp->getCAFile().c_str());
241 curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, gVerifySSLCert); 241 curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYPEER, (long) gVerifySSLCert);
242 curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYHOST, gVerifySSLCert? 2 : 0); 242 curl_easy_setopt(mCurl, CURLOPT_SSL_VERIFYHOST, gVerifySSLCert? 2L : 0L);
243 243
244 /* Setting the DNS cache timeout to -1 disables it completely. 244 /* Setting the DNS cache timeout to -1 disables it completely.
245 This might help with bug #503 */ 245 This might help with bug #503 */
246 curl_easy_setopt(mCurl, CURLOPT_DNS_CACHE_TIMEOUT, -1); 246 curl_easy_setopt(mCurl, CURLOPT_DNS_CACHE_TIMEOUT, -1L);
247 247
248 mHeaders = curl_slist_append(mHeaders, "Content-Type: text/xml"); 248 mHeaders = curl_slist_append(mHeaders, "Content-Type: text/xml");
249 curl_easy_setopt(mCurl, CURLOPT_URL, mURI.c_str()); 249 curl_easy_setopt(mCurl, CURLOPT_URL, mURI.c_str());
@@ -257,7 +257,7 @@ void LLXMLRPCTransaction::Impl::init(XMLRPC_REQUEST request, bool useGzip)
257 if (mRequestText) 257 if (mRequestText)
258 { 258 {
259 curl_easy_setopt(mCurl, CURLOPT_POSTFIELDS, mRequestText); 259 curl_easy_setopt(mCurl, CURLOPT_POSTFIELDS, mRequestText);
260 curl_easy_setopt(mCurl, CURLOPT_POSTFIELDSIZE, mRequestTextSize); 260 curl_easy_setopt(mCurl, CURLOPT_POSTFIELDSIZE, (long) mRequestTextSize);
261 } 261 }
262 else 262 else
263 { 263 {