1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-21 16:22:22 +02:00

Merge branch 'develop-olympus' into develop-ascraeus

* 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
commit e3e427fa24

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.
file_gc(false);
@ -238,6 +233,11 @@ function send_file_to_browser($attachment, $upload_dir, $category)
exit;
}
if ($size)
{
header("Content-Length: $size");
}
// Try to deliver in chunks
@set_time_limit(0);