keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move force_ssl behavior

Browse source
This commit is contained in:
Philipp 2023-02-18 20:47:52 +01:00
parent dbb7022ca5
commit 402d45d490
No known key found for this signature in database
GPG key ID: 24A7501396EB5432
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
index.php
View file

@ -48,5 +48,6 @@ $a->runFrontend(
$dice->create(\Friendica\Content\Nav::class), $dice->create(\Friendica\Content\Nav::class),
$dice->create(Friendica\Module\Special\HTTPException::class), $dice->create(Friendica\Module\Special\HTTPException::class),
new \Friendica\Util\HTTPInputData($_SERVER), new \Friendica\Util\HTTPInputData($_SERVER),
$start_time $start_time,
$_SERVER
); );

11
src/App.php
View file

@ -555,11 +555,12 @@ class App
* @param ModuleHTTPException $httpException The possible HTTP Exception container * @param ModuleHTTPException $httpException The possible HTTP Exception container
* @param HTTPInputData $httpInput A library for processing PHP input streams * @param HTTPInputData $httpInput A library for processing PHP input streams
* @param float $start_time The start time of the overall script execution * @param float $start_time The start time of the overall script execution
* @param array $server The $_SERVER array
* *
* @throws HTTPException\InternalServerErrorException * @throws HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time) public function runFrontend(App\Router $router, IManagePersonalConfigValues $pconfig, Authentication $auth, App\Page $page, Nav $nav, ModuleHTTPException $httpException, HTTPInputData $httpInput, float $start_time, array $server)
{ {
$this->profiler->set($start_time, 'start'); $this->profiler->set($start_time, 'start');
$this->profiler->set(microtime(true), 'classinit'); $this->profiler->set(microtime(true), 'classinit');
@ -575,10 +576,12 @@ class App
if (!$this->mode->isInstall()) { if (!$this->mode->isInstall()) {
// Force SSL redirection // Force SSL redirection
if ($this->baseURL->checkRedirectHttps()) { if ($this->config->get('system', 'force_ssl') &&
System::externalRedirect($this->baseURL->get() . '/' . $this->args->getQueryString()); (empty($server['HTTPS']) || $server['HTTPS'] === 'off') &&
!empty($server['REQUEST_METHOD']) &&
$server['REQUEST_METHOD'] === 'GET') {
System::externalRedirect($this->baseURL . '/' . $this->args->getQueryString());
} }
Core\Hook::callAll('init_1'); Core\Hook::callAll('init_1');
} }