livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-8297 Fixed "Missing CA File" message when running under debugger on windows

meow-7.2.2
andreykproductengine 2018-02-15 21:48:18 +02:00
parent 86935443eb
commit b2f61c0e0b
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llvfs/lldir_win32.cpp
View File

@ -233,7 +233,7 @@ void LLDir_Win32::initAppDirs(const std::string &app_name,
LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
}
mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
mCAFile = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" );
}
U32 LLDir_Win32::countFilesInDir(const std::string &dirname, const std::string &mask)

2
indra/newview/llsechandler_basic.cpp
View File

@ -1275,7 +1275,7 @@ void LLSecAPIBasicHandler::init()
// grab the application ca-bundle.crt file that contains the well-known certs shipped
// with the product
std::string ca_file_path = gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" );
LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL;
LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path);

2
indra/newview/llviewermedia.cpp
View File

@ -2029,7 +2029,7 @@ bool LLViewerMediaImpl::initializePlugin(const std::string& media_type)
// the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones
// Qt/WebKit loads from your system location.
std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "ca-bundle.crt" );
std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "app_settings", "ca-bundle.crt" );
media_source->addCertificateFilePath( ca_path );
media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));

9
indra/newview/viewer_manifest.py
View File

@ -595,6 +595,9 @@ class WindowsManifest(ViewerManifest):
self.path("featuretable.txt")
self.path("ca-bundle.crt")
with self.prefix(src=pkgdir,dst="app_settings"):
self.path("ca-bundle.crt")
# Media plugins - CEF
with self.prefix(src='../media_plugins/cef/%s' % self.args['configuration'], dst="llplugin"):
self.path("media_plugin_cef.dll")
@ -1052,6 +1055,9 @@ open "%s" --args "$@"
self.path("SecondLife.nib")
self.path("ca-bundle.crt")
with self.prefix(src=pkgdir,dst="app_settings"):
self.path("ca-bundle.crt")
self.path("SecondLife.nib")
# Translations
@ -1510,6 +1516,9 @@ class LinuxManifest(ViewerManifest):
self.path("featuretable_linux.txt")
self.path("ca-bundle.crt")
with self.prefix(src=pkgdir,dst="app_settings"):
self.path("ca-bundle.crt")
def package_finish(self):
installer_name = self.installer_base_name()