Merged MAINT-8297

Fri, 02 Mar 2018 20:07:22 +0200

author
AndreyL ProductEngine <alihatskiy@productengine.com>
date
Fri, 02 Mar 2018 20:07:22 +0200
changeset 55324
b968bfa33629
parent 55323
29d6fbc0f354
parent 55321
44aa78dae0cf
child 55325
04ed11595051
child 55326
8285df44a039

Merged MAINT-8297

     1.1 --- a/indra/llvfs/lldir_linux.cpp	Fri Mar 02 18:31:05 2018 +0200
     1.2 +++ b/indra/llvfs/lldir_linux.cpp	Fri Mar 02 20:07:22 2018 +0200
     1.3 @@ -208,7 +208,7 @@
     1.4  		LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
     1.5  	}
     1.6  
     1.7 -	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     1.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     1.9  }
    1.10  
    1.11  U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask)
     2.1 --- a/indra/llvfs/lldir_mac.cpp	Fri Mar 02 18:31:05 2018 +0200
     2.2 +++ b/indra/llvfs/lldir_mac.cpp	Fri Mar 02 20:07:22 2018 +0200
     2.3 @@ -173,7 +173,7 @@
     2.4  		mAppRODataDir = app_read_only_data_dir;
     2.5  		mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
     2.6  	}
     2.7 -	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     2.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "../Resources", "ca-bundle.crt");
     2.9  }
    2.10  
    2.11  std::string LLDir_Mac::getCurPath()
     3.1 --- a/indra/llvfs/lldir_solaris.cpp	Fri Mar 02 18:31:05 2018 +0200
     3.2 +++ b/indra/llvfs/lldir_solaris.cpp	Fri Mar 02 20:07:22 2018 +0200
     3.3 @@ -226,7 +226,7 @@
     3.4  		LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
     3.5  	}
     3.6  
     3.7 -	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     3.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     3.9  }
    3.10  
    3.11  U32 LLDir_Solaris::countFilesInDir(const std::string &dirname, const std::string &mask)
     4.1 --- a/indra/newview/llsechandler_basic.cpp	Fri Mar 02 18:31:05 2018 +0200
     4.2 +++ b/indra/newview/llsechandler_basic.cpp	Fri Mar 02 20:07:22 2018 +0200
     4.3 @@ -1275,7 +1275,7 @@
     4.4  		
     4.5  		// grab the application ca-bundle.crt file that contains the well-known certs shipped
     4.6  		// with the product
     4.7 -		std::string ca_file_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" );
     4.8 +		std::string ca_file_path = gDirUtilp->getCAFile();
     4.9  		LL_INFOS("SECAPI") << "Loading application certificate store from " << ca_file_path << LL_ENDL;
    4.10  		LLPointer<LLBasicCertificateStore> app_ca_store = new LLBasicCertificateStore(ca_file_path);
    4.11  		
     5.1 --- a/indra/newview/llviewermedia.cpp	Fri Mar 02 18:31:05 2018 +0200
     5.2 +++ b/indra/newview/llviewermedia.cpp	Fri Mar 02 20:07:22 2018 +0200
     5.3 @@ -2029,7 +2029,7 @@
     5.4  
     5.5  		// the correct way to deal with certs it to load ours from ca-bundle.crt and append them to the ones
     5.6  		// Qt/WebKit loads from your system location.
     5.7 -		std::string ca_path = gDirUtilp->getExpandedFilename( LL_PATH_EXECUTABLE, "ca-bundle.crt" );
     5.8 +		std::string ca_path = gDirUtilp->getCAFile();
     5.9  		media_source->addCertificateFilePath( ca_path );
    5.10  
    5.11  		media_source->proxy_setup(gSavedSettings.getBOOL("BrowserProxyEnabled"), gSavedSettings.getString("BrowserProxyAddress"), gSavedSettings.getS32("BrowserProxyPort"));

mercurial