From 5387df2a3fba1bdc01b6341b79b7d024cd124230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 27 Jun 2018 17:49:47 +0200 Subject: [PATCH] [ticket/15286] Download remote attachments properly PHPBB3-15286 --- phpBB/includes/functions_download.php | 26 ++------------------------ 1 file changed, 2 insertions(+), 24 deletions(-) diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index b74a386e3e..f60a3f5242 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -248,30 +248,8 @@ function send_file_to_browser($attachment, $category) if ($fp !== false) { - // Deliver file partially if requested - if ($range = phpbb_http_byte_range($size)) - { - fseek($fp, $range['byte_pos_start']); - - send_status_line(206, 'Partial Content'); - header('Content-Range: bytes ' . $range['byte_pos_start'] . '-' . $range['byte_pos_end'] . '/' . $range['bytes_total']); - header('Content-Length: ' . $range['bytes_requested']); - - // First read chunks - while (!feof($fp) && ftell($fp) < $range['byte_pos_end'] - 8192) - { - echo fread($fp, 8192); - } - // Then, read the remainder - echo fread($fp, $range['bytes_requested'] % 8192); - } - else - { - while (!feof($fp)) - { - echo fread($fp, 8192); - } - } + $output = fopen('php://output', 'w+b'); + stream_copy_to_stream($fp, $output); fclose($fp); }