From dd469f6bc0dab8d37fddf06aba323906c861cfa4 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Tue, 30 May 2023 13:51:07 +0700 Subject: [PATCH] Fixed empty $_SERVER['SERVER_PROTOCOL'] in cron (#744) --- common.php | 6 ++++++ library/config.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common.php b/common.php index a329dfd5d..d4ad642a0 100644 --- a/common.php +++ b/common.php @@ -27,6 +27,12 @@ if (empty($_SERVER['HTTP_REFERER'])) { if (empty($_SERVER['SERVER_NAME'])) { $_SERVER['SERVER_NAME'] = ''; } +if (empty($_SERVER['SERVER_PROTOCOL'])) { + $_SERVER['SERVER_PROTOCOL'] = getenv('SERVER_PROTOCOL') ?? 'HTTP/1.1'; +} +if (empty($_SERVER['SERVER_ADDR'])) { + $_SERVER['SERVER_ADDR'] = getenv('SERVER_ADDR'); +} if (!defined('BB_ROOT')) { define('BB_ROOT', './'); diff --git a/library/config.php b/library/config.php index ba8400a0b..abfa48c00 100644 --- a/library/config.php +++ b/library/config.php @@ -353,7 +353,7 @@ $bb_cfg['show_sidebar1_on_every_page'] = false; $bb_cfg['show_sidebar2_on_every_page'] = false; // Cookie -$bb_cfg['cookie_domain'] = in_array($domain_name, [getenv('SERVER_ADDR'), 'localhost'], true) ? '' : ".$domain_name"; +$bb_cfg['cookie_domain'] = in_array($domain_name, [$_SERVER['SERVER_ADDR'], 'localhost'], true) ? '' : ".$domain_name"; $bb_cfg['cookie_secure'] = $domain_ssl ? true : \TorrentPier\Helpers\IsHelper::isHTTPS(); $bb_cfg['cookie_prefix'] = 'bb_'; // 'bb_' $bb_cfg['cookie_same_site'] = 'Lax'; // Lax, None, Strict | https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite