Merge branch '3.3.x'

iMattPro · Dec 8, 2024 · 1096b09 · 1096b09
2 parents 8045165 + e73ba63
commit 1096b09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php
@@ -51,6 +51,10 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6
 		return new Client([
 			'base_uri' => $host,
 			'timeout'  => $timeout,
+			'headers' => [
+				'user-agent' => 'phpBB/' . PHPBB_VERSION,
+				'accept' => '*/*',
+			  ],
 		]);
 	}
 

diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php
@@ -382,7 +382,7 @@ public function get_versions($force_update = false, $force_cache = false)
 		}
 		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))