composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.2' into develop

Browse Source
This commit is contained in:
Molkobain
2026-04-17 09:20:18 +02:00
parent 4e24ac508d 89231976f8
commit a6171c896b
3 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/cmdbsource.class.inc.php
View File

@@ -1579,8 +1579,6 @@ class CMDBSource
if (static::GetDBVendor() === static::ENUM_DB_VENDOR_MYSQL) { if (static::GetDBVendor() === static::ENUM_DB_VENDOR_MYSQL) {
//Mysql 5.7.0 and upper deprecated --ssl and uses --ssl-mode instead //Mysql 5.7.0 and upper deprecated --ssl and uses --ssl-mode instead
return version_compare(static::GetDBVersion(), '5.7.11', '>='); return version_compare(static::GetDBVersion(), '5.7.11', '>=');
} elseif (static::GetDBVendor() === static::ENUM_DB_VENDOR_MARIADB) {
return version_compare(static::GetDBVersion(), '10.2.6', '>=');
} }
return false; return false;
} }

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

@@ -511,7 +511,7 @@ EOF;
{ {
$bDbTlsEnabled = $oConfig->Get('db_tls.enabled'); $bDbTlsEnabled = $oConfig->Get('db_tls.enabled');
if (!$bDbTlsEnabled) { if (!$bDbTlsEnabled) {
return CMDBSource::IsSslModeDBVersion() ? ' --skip-ssl' : ''; return '';
} }
$sTlsOptions = ''; $sTlsOptions = '';
// Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead // Mysql 5.7.11 and upper deprecated --ssl and uses --ssl-mode instead

6
tests/php-unit-tests/unitary-tests/setup/DBBackupTest.php
View File

@@ -45,11 +45,7 @@ class DBBackupTest extends ItopTestCase
$oConfigToTest->Set('db_tls.enabled', false); $oConfigToTest->Set('db_tls.enabled', false);
$sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest); $sCliArgsNoTls = DBBackup::GetMysqlCliTlsOptions($oConfigToTest);
if (CMDBSource::IsSslModeDBVersion()) { $this->assertEmpty($sCliArgsNoTls);
$this->assertEquals(' --skip-ssl', $sCliArgsNoTls);
} else {
$this->assertEmpty($sCliArgsNoTls);
}
} }
/** /**