composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Pierre Goiffon
2019-07-01 17:30:21 +02:00
parent f7af705bb5 33903f570b
commit 6c81163d20
35 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
setup/backup.class.inc.php
View File

@@ -649,10 +649,20 @@ EOF;
{
return '';
}
$sTlsOptions = '';
$sTlsOptions .= ' --ssl';
$sDBVendor= CMDBSource::GetDBVendor();
$sDBVersion = CMDBSource::GetDBVersion();
$sMysqlSSLModeVersion = '5.7.0'; //Mysql 5.7.0 and upper deprecated --ssl and uses --ssl-mode instead
if ($sDBVendor === CMDBSource::ENUM_DB_VENDOR_MYSQL && version_compare($sDBVersion, $sMysqlSSLModeVersion, '>='))
{
$sTlsOptions .= ' --ssl-mode=VERIFY_CA';
}
else
{
$sTlsOptions .= ' --ssl';
}
// ssl-key parameter : not implemented
// ssl-cert parameter : not implemented