Skip to content
Permalink
Browse files

[stable9] Set content-type to "application/octet-stream"

Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly.

Backport of #258
  • Loading branch information...
LukasReschke committed Jun 30, 2016
1 parent 95f6dd9 commit 94975af6db1551c2d23136c2ea22866a5b416070
@@ -103,7 +103,8 @@ public function getEntries($count=50, $offset=0) {
*/
public function download() {
$resp = new StreamResponse(\OC_Log_Owncloud::getLogFilePath());
$resp->addHeader('Content-Disposition', 'attachment; filename="owncloud.log"');
$resp->addHeader('Content-Type', 'application/octet-stream');
$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
return $resp;
}
}
@@ -11,6 +11,7 @@
use \OC\Settings\Application;
use OC\Settings\Controller\LogSettingsController;
use OCP\AppFramework\Http\StreamResponse;
/**
* @package OC\Settings\Controller
@@ -69,6 +70,9 @@ public function logLevelData() {
public function testDownload() {
$response = $this->logSettingsController->download();
$this->assertInstanceOf('\OCP\AppFramework\Http\StreamResponse', $response);
$expected = new StreamResponse(\OC_Log_Owncloud::getLogFilePath());
$expected->addHeader('Content-Type', 'application/octet-stream');
$expected->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
$this->assertEquals($expected, $response);
}
}

0 comments on commit 94975af

Please sign in to comment.
You can’t perform that action at this time.