diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-21 14:21:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-08-21 14:21:38 +0000 |
| commit | 76a542a03e11db7fbe61e8c151f0d7f8124fd7d1 (patch) | |
| tree | 172b0b1fae6b62233daab6b30d55ea9e7eb90166 | |
| parent | d67b943ef622e7e41298a0c8a33180da99d6d811 (diff) | |
| download | forums-76a542a03e11db7fbe61e8c151f0d7f8124fd7d1.tar forums-76a542a03e11db7fbe61e8c151f0d7f8124fd7d1.tar.gz forums-76a542a03e11db7fbe61e8c151f0d7f8124fd7d1.tar.bz2 forums-76a542a03e11db7fbe61e8c151f0d7f8124fd7d1.tar.xz forums-76a542a03e11db7fbe61e8c151f0d7f8124fd7d1.zip | |
merge
git-svn-id: file:///svn/phpbb/trunk@8773 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/download/file.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/db/dbal.php | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 1616448c0b..830967c213 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -456,6 +456,10 @@ function send_file_to_browser($attachment, $upload_dir, $category) { header("Content-Length: $size"); } + + // Close the db connection before sending the file + $db->sql_close(); + if (!set_modified_headers($attachment['filetime'], $user->browser)) { // Try to deliver in chunks diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index b88873df46..af5dfa059b 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -147,7 +147,13 @@ class dbal $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; } /** |