diff options
| -rw-r--r-- | apps/dav/lib/Connector/Sabre/FilesPlugin.php | 1 | ||||
| -rw-r--r-- | apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php | 7 | ||||
| -rw-r--r-- | lib/private/Streamer.php | 1 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Files.php | 1 |
4 files changed, 8 insertions, 2 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php index 017b1d31841..180f05c0e7e 100644 --- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php +++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php @@ -291,6 +291,7 @@ class FilesPlugin extends ServerPlugin { $response->addHeader('OC-Checksum', $checksum); } } + $response->addHeader('X-Accel-Buffering', 'no'); } /** diff --git a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php index 201b2b863ab..777a730ffd1 100644 --- a/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php +++ b/apps/dav/tests/unit/Connector/Sabre/FilesPluginTest.php @@ -590,9 +590,12 @@ class FilesPluginTest extends TestCase { ->willReturn($isClumsyAgent); $response - ->expects($this->once()) + ->expects($this->exactly(2)) ->method('addHeader') - ->with('Content-Disposition', $contentDispositionHeader); + ->withConsecutive( + ['Content-Disposition', $contentDispositionHeader], + ['X-Accel-Buffering', 'no'] + ); $this->plugin->httpGet($request, $response); } diff --git a/lib/private/Streamer.php b/lib/private/Streamer.php index 176334b971d..80ab5a5524c 100644 --- a/lib/private/Streamer.php +++ b/lib/private/Streamer.php @@ -95,6 +95,7 @@ class Streamer { * @param string $name */ public function sendHeaders($name) { + header('X-Accel-Buffering: no'); $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar'; $fullName = $name . $extension; $this->streamerInstance->sendHeaders($fullName); diff --git a/lib/private/legacy/OC_Files.php b/lib/private/legacy/OC_Files.php index d1af5b24bdd..41ac20577b2 100644 --- a/lib/private/legacy/OC_Files.php +++ b/lib/private/legacy/OC_Files.php @@ -98,6 +98,7 @@ class OC_Files { } } header('Content-Type: '.$type, true); + header('X-Accel-Buffering: no'); } /** |