makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2024-12-08 16:56:52 +00:00
commit 1096b094cb
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/file_downloader.php
View file

@ -51,6 +51,10 @@ class file_downloader
return new Client([
'base_uri' => $host,
'timeout' => $timeout,
'headers' => [
'user-agent' => 'phpBB/' . PHPBB_VERSION,
'accept' => '*/*',
],
]);
}

2
phpBB/phpbb/version_helper.php
View file

@ -382,7 +382,7 @@ class version_helper
}
else if ($info === false || $force_update)
{
$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80);
$info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80, 30);
$error_string = $this->file_downloader->get_error_string();
if (!empty($error_string))