Merge pull request #29403 from owncloud/disable_nginx_buffering_on_do…

…wnloads_stable10 [stable10] Disable nginx buffering for file downloads
owncloud · Nov 6, 2017 · 42a4dc5 · 42a4dc5
2 parents 97c5a7c + 1571dc3
commit 42a4dc5
Show file tree

Hide file tree

Showing 2 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
@@ -251,6 +251,9 @@ function httpGet(RequestInterface $request, ResponseInterface $response) {
 			if ($checksum !== null && $checksum !== '') {
 				$response->addHeader('OC-Checksum', $checksum);
 			}
+			// disable nginx buffering so big downloads through ownCloud won't
+			// cause memory problems in the nginx process.
+			$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
@@ -541,9 +541,12 @@ public function testDownloadHeaders($isClumsyAgent, $contentDispositionHeader) {
 			->will($this->returnValue($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);
 	}