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

Use added cacert.pem from mozilla like default CA file

--HG--
branch : compatibility-develop
hg/compatibility-develop
ulukyn 6 years ago
parent 15cbe4d1c1
commit 5d5a818fd6

File diff suppressed because it is too large Load Diff

@ -52,7 +52,8 @@ NamingPolicyURL = "http://app.ryzom.com/app_forum/index.php?page=topic/view/2
// cacert.pem file can be downloaded from https://curl.haxx.se/docs/caextract.html // 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 // and added to client data path or system specific bundle can be used
// Ubuntu has "/etc/ssl/certs/ca-certificates.crt" // Ubuntu has "/etc/ssl/certs/ca-certificates.crt"
//CurlCABundle = "cacert.pem"; // % = defaultConfigFilePath
CurlCABundle = "%cacert.pem";
//////////////// ////////////////
// INTERFACES // // INTERFACES //

@ -1079,6 +1079,12 @@ void CClientConfig::setValues()
ClientCfg.CurlMaxConnections = 2; ClientCfg.CurlMaxConnections = 2;
READ_STRING_FV(CurlCABundle); 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 // // ANIMATION //

Loading…
Cancel
Save