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

[ticket/12755] Change upload in remote_upload() method to fit get_remote_file

Browse source 
PHPBB3-12755
This commit is contained in:
Marc Alexander 2014-06-24 11:53:32 +02:00
parent 8817b59377
commit 5ee1e07e17
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
phpBB/includes/functions_upload.php
View file

@ -467,7 +467,7 @@ class fileupload
var $error_prefix = ''; var $error_prefix = '';
/** @var int Timeout for remote upload */ /** @var int Timeout for remote upload */
var $upload_timeout = 5; var $upload_timeout = 6;
/** /**
* Init file upload class. * Init file upload class.
@ -788,9 +788,6 @@ class fileupload
return $file; return $file;
} }
// Set a proper timeout for the socket
socket_set_timeout($fsock, $this->upload_timeout);
// Make sure $path not beginning with / // Make sure $path not beginning with /
if (strpos($path, '/') === 0) if (strpos($path, '/') === 0)
{ {
@ -801,9 +798,12 @@ class fileupload
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");
// Set a proper timeout for the socket
socket_set_timeout($fsock, $this->upload_timeout);
$get_info = false; $get_info = false;
$data = ''; $data = '';
$upload_start = time(); $timer_stop = time() + $this->upload_timeout;
while (!@feof($fsock)) while (!@feof($fsock))
{ {
@ -821,13 +821,6 @@ class fileupload
} }
$data .= $block; $data .= $block;
// Cancel upload if we exceed timeout
if ((time() - $upload_start) >= $this->upload_timeout)
{
$file = new fileerror($user->lang[$this->error_prefix . 'REMOTE_UPLOAD_TIMEOUT']);
return $file;
}
} }
else else
{ {
@ -862,6 +855,15 @@ class fileupload
} }
} }
} }
$stream_meta_data = stream_get_meta_data($fsock);
// Cancel upload if we exceed timeout
if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop)
{
$file = new fileerror($user->lang[$this->error_prefix . 'REMOTE_UPLOAD_TIMEOUT']);
return $file;
}
} }
@fclose($fsock); @fclose($fsock);