Add X-Accel-Buffering header to downloads

Signed-off-by: Unpublished <unpublished@gmx.net>
nextcloud · Apr 13, 2021 · a822317 · a822317
1 parent 23b8e4a
commit a822317
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -281,6 +281,7 @@ public function httpGet(RequestInterface $request, ResponseInterface $response)
 				$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
@@ -576,9 +576,12 @@ public function testDownloadHeaders($isClumsyAgent, $contentDispositionHeader) {
 			->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
@@ -95,6 +95,7 @@ public function __construct(IRequest $request, int $size, int $numberOfFiles) {
 	 * @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
@@ -98,6 +98,7 @@ private static function sendHeaders($filename, $name, array $rangeArray) {
 			}
 		}
 		header('Content-Type: '.$type, true);
+		header('X-Accel-Buffering: no');
 	}
 
 	/**