Merge branch '292-sslcertificatechainfile_always_empty' into pu

This commit is contained in:
Kienan Stewart 2018-07-31 15:44:03 -04:00
commit eb4b7242a4
1 changed files with 1 additions and 1 deletions

View File

@ -608,7 +608,7 @@ SELECT ?,?,?, FROM_UNIXTIME(?), FROM_UNIXTIME(?), ?, ?, sslcsr FROM certificate
$s = file_get_contents($TARGET_FILE);
$s = str_replace("%%CRT%%", $cert["crt"], $s);
$s = str_replace("%%KEY%%", $cert["key"], $s);
if (isset($cert["sslchain"]) && $cert["sslchain"]) {
if (isset($cert["chain"]) && $cert["chain"]) {
$s = str_replace("%%CHAINLINE%%", "SSLCertificateChainFile " . $cert["chain"], $s);
} else {
$s = str_replace("%%CHAINLINE%%", "", $s);