mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
close db connection before delivering file. Also make sure connection can't be closed twice.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8772 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
9db6e7caa6
commit
7e28be5968
2 changed files with 11 additions and 1 deletions
|
@ -479,6 +479,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
|
||||||
|
|
|
@ -138,7 +138,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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Add table
Reference in a new issue