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

First set of changes for new librarys and lib layout support!

Browse Source 
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
This commit is contained in:
Drake Arconis
2012-07-04 00:26:42 +00:00
parent 9db7bcde00
commit 7af331c50d
31 changed files with 1800 additions and 2079 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llmessage/llcurl.cpp
View File

@@ -309,6 +309,14 @@ LLCurl::Easy* LLCurl::Easy::getEasy()
CURLcode result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_DNS_CACHE_TIMEOUT, 0);
check_curl_code(result);
// Disable SSL/TLS session caching. Some servers refuse to talk to us when session ids are enabled.
// id.secondlife.com is such a server, when greeted with a SSL HELLO and a session id, it immediatly returns a RST packet and closes
// the connections.
// Fixes: FIRE-5368, FIRE-5756, VWR-28039, VWR-28629
result = curl_easy_setopt(easy->mCurlEasyHandle, CURLOPT_SSL_SESSIONID_CACHE, 0);
check_curl_code(result);
++gCurlEasyCount;
return easy;
}
@@ -758,7 +766,7 @@ bool LLCurl::Multi::doPerform()
}
mQueued = q;
setState(STATE_COMPLETED) ;
setState(STATE_COMPLETED) ;
mIdleTimer.reset() ;
}
else if(!mValid && mIdleTimer.getElapsedTimeF32() > mIdleTimeOut) //idle for too long, remove it.