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

merge

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8773 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2008-08-21 14:21:38 +00:00
parent d67b943ef6
commit 76a542a03e
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/download/file.php
View file

@ -456,6 +456,10 @@ function send_file_to_browser($attachment, $upload_dir, $category)
{ {
header("Content-Length: $size"); header("Content-Length: $size");
} }
// Close the db connection before sending the file
$db->sql_close();
if (!set_modified_headers($attachment['filetime'], $user->browser)) if (!set_modified_headers($attachment['filetime'], $user->browser))
{ {
// Try to deliver in chunks // Try to deliver in chunks

8
phpBB/includes/db/dbal.php
View file

@ -147,7 +147,13 @@ class dbal
$this->sql_freeresult($query_id); $this->sql_freeresult($query_id);
} }
return $this->_sql_close(); // Connection closed correctly. Set db_connect_id to false to prevent errors
if (($result = $this->_sql_close()))
{
$this->db_connect_id = false;
}
return $result;
} }
/** /**