Added: add a way to prefix CurlCABundle file with defaultConfigFileName using "%"

Use added cacert.pem from mozilla like default CA file

--HG--
branch : patches-from-atys
hg/hotfix/patches-from-atys
ulukyn 6 years ago
parent e9e2590d53
commit 48f3d3b244

File diff suppressed because it is too large Load Diff

@ -56,7 +56,8 @@ InstallWebPage = "";
// cacert.pem file can be downloaded from https://curl.haxx.se/docs/caextract.html
// and added to client data path or system specific bundle can be used
// Ubuntu has "/etc/ssl/certs/ca-certificates.crt"
//CurlCABundle = "cacert.pem";
// % = defaultConfigFilePath
CurlCABundle = "%cacert.pem";
////////////////
// INTERFACES //

@ -1108,7 +1108,13 @@ void CClientConfig::setValues()
ClientCfg.CurlMaxConnections = 2;
READ_STRING_FV(CurlCABundle);
if (ClientCfg.CurlCABundle[0] == '%') // Path is relative to client_default.cfg path (used by ryzom patch)
{
string defaultConfigFileName;
if (ClientCfg.getDefaultConfigLocation(defaultConfigFileName))
ClientCfg.CurlCABundle = CFile::getPath(defaultConfigFileName)+ClientCfg.CurlCABundle.substr(1);
}
///////////////
// ANIMATION //
// AnimatedAngleThreshold

Loading…
Cancel
Save