Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
Nimetu 2015-11-08 03:07:14 +02:00
commit aaf5248d05
5 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/gui/group_html.h
View file

@ -64,8 +64,10 @@ namespace NLGUI
std::string languageCode;
/// List of domains the widget can consider secure.
std::vector< std::string > trustedDomains;
/// Maximum concurrent MultiCurl connections per CGroupHTML instance
sint32 curlMaxConnections;
SWebOptions()
SWebOptions(): curlMaxConnections(2)
{
}
};

5
code/nel/src/gui/group_html.cpp
View file

@ -2090,6 +2090,11 @@ namespace NLGUI
clearContext();
MultiCurl = curl_multi_init();
if (MultiCurl)
{
curl_multi_setopt(MultiCurl, CURLMOPT_MAX_HOST_CONNECTIONS, options.curlMaxConnections);
curl_multi_setopt(MultiCurl, CURLMOPT_PIPELINING, 1);
}
RunningCurls = 0;
_CurlWWW = NULL;

5
code/ryzom/client/src/client_cfg.cpp
View file

@ -429,6 +429,8 @@ CClientConfig::CClientConfig()
WebIgMainDomain = "atys.ryzom.com";
WebIgTrustedDomains.push_back(WebIgMainDomain);
CurlMaxConnections = 2;
RingReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes_ring/index.php";
ReleaseNotePath = "http://" + WebIgMainDomain + "/releasenotes/index.php";
@ -1059,6 +1061,9 @@ void CClientConfig::setValues()
// WEBIG //
READ_STRING_FV(WebIgMainDomain);
READ_STRINGVECTOR_FV(WebIgTrustedDomains);
READ_INT_FV(CurlMaxConnections);
if (ClientCfg.CurlMaxConnections < 0)
ClientCfg.CurlMaxConnections = 2;
///////////////
// ANIMATION //

1
code/ryzom/client/src/client_cfg.h
View file

@ -304,6 +304,7 @@ struct CClientConfig
std::string WebIgMainDomain;
std::vector<string> WebIgTrustedDomains;
sint32 CurlMaxConnections;
///////////////
// ANIMATION //

1
code/ryzom/client/src/interface_v3/interface_manager.cpp
View file

@ -469,6 +469,7 @@ CInterfaceManager::CInterfaceManager()
CGroupHTML::options.languageCode = ClientCfg.getHtmlLanguageCode();
CGroupHTML::options.appName = getUserAgentName();
CGroupHTML::options.appVersion = getUserAgentVersion();
CGroupHTML::options.curlMaxConnections = ClientCfg.CurlMaxConnections;
NLGUI::CDBManager::getInstance()->resizeBanks( NB_CDB_BANKS );
interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();