mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-04 15:57:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse Source 
* develop-olympus:
  [ticket/13414] Set Content-Length header only if status is not 304

Conflicts:
	phpBB/download/file.php
This commit is contained in:
Andreas Fischer
2015-01-28 19:56:47 +01:00
parent 1c6ebcf02b 9d72463824
commit e3e427fa24
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/includes/functions_download.php
View File

@@ -210,11 +210,6 @@ function send_file_to_browser($attachment, $upload_dir, $category)
} }
} }
if ($size)
{
header("Content-Length: $size");
}
// Close the db connection before sending the file etc. // Close the db connection before sending the file etc.
file_gc(false); file_gc(false);
@@ -238,6 +233,11 @@ function send_file_to_browser($attachment, $upload_dir, $category)
exit; exit;
} }
if ($size)
{
header("Content-Length: $size");
}
// Try to deliver in chunks // Try to deliver in chunks
@set_time_limit(0); @set_time_limit(0);