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

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
This commit is contained in:
Nils Adermann 2011-10-14 02:49:15 +02:00
commit c5ee92c3f2
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_update.php
View file

@ -37,7 +37,7 @@ class acp_update
$errstr = ''; $errstr = '';
$errno = 0; $errno = 0;
$info = obtain_latest_version_info(request_var('versioncheck_force', false), true); $info = obtain_latest_version_info(request_var('versioncheck_force', false));
if ($info === false) if ($info === false)
{ {

13
phpBB/includes/functions_admin.php
View file

@ -3111,7 +3111,7 @@ function get_database_size()
/** /**
* Retrieve contents from remotely stored file * Retrieve contents from remotely stored file
*/ */
function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 10) function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 6)
{ {
global $user; global $user;
@ -3121,6 +3121,9 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
@fputs($fsock, "HOST: $host\r\n"); @fputs($fsock, "HOST: $host\r\n");
@fputs($fsock, "Connection: close\r\n\r\n"); @fputs($fsock, "Connection: close\r\n\r\n");
$timer_stop = time() + $timeout;
stream_set_timeout($fsock, $timeout);
$file_info = ''; $file_info = '';
$get_info = false; $get_info = false;
@ -3143,6 +3146,14 @@ function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port
return false; return false;
} }
} }
$stream_meta_data = stream_get_meta_data($fsock);
if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
{
$errstr = $user->lang['FSOCK_TIMEOUT'];
return false;
}
} }
@fclose($fsock); @fclose($fsock);
} }

1
phpBB/language/en/common.php
View file

@ -200,6 +200,7 @@ $lang = array_merge($lang, array(
'FORUM_RULES_LINK' => 'Please click here to view the forum rules', 'FORUM_RULES_LINK' => 'Please click here to view the forum rules',
'FROM' => 'from', 'FROM' => 'from',
'FSOCK_DISABLED' => 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.', 'FSOCK_DISABLED' => 'The operation could not be completed because the <var>fsockopen</var> function has been disabled or the server being queried could not be found.',
'FSOCK_TIMEOUT' => 'A timeout occurred while reading from the network stream.',
'FTP_FSOCK_HOST' => 'FTP host', 'FTP_FSOCK_HOST' => 'FTP host',
'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.', 'FTP_FSOCK_HOST_EXPLAIN' => 'FTP server used to connect your site.',