wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

we no longer need to keep the session open for encryption

Browse source
This commit is contained in:
Bjoern Schiessle 2014-11-25 10:17:31 +01:00
parent 917bef39b7
commit 1d33503487
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/files/ajax/upload.php
View file

@ -1,5 +1,7 @@
<?php
\OC::$server->getSession()->close();
// Firefox and Konqueror tries to download application/json for me. --Arthur
OCP\JSON::setContentTypeHeader('text/plain');
@ -64,13 +66,7 @@ if (empty($_POST['dirToken'])) {
}
}
OCP\JSON::callCheck();
if (!\OCP\App::isEnabled('files_encryption')) {
// encryption app need to create keys later, so can't close too early
\OC::$server->getSession()->close();
}
// get array with current storage stats (e.g. max file size)
$storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);

9
apps/files_sharing/lib/controllers/sharecontroller.php
View file

@ -205,7 +205,6 @@ class ShareController extends Controller {
/**
* @PublicPage
* @NoCSRFRequired
* @UseSession
*
* @param string $token
* @param string $files
@ -215,12 +214,6 @@ class ShareController extends Controller {
public function downloadShare($token, $files = null, $path = '') {
\OC_User::setIncognitoMode(true);
// FIXME: Use DI once there is a suitable class
if (!\OCP\App::isEnabled('files_encryption')) {
// encryption app requires the session to store the keys in
\OC::$server->getSession()->close();
}
$linkItem = OCP\Share::getShareByToken($token, false);
// Share is password protected - check whether the user is permitted to access the share
@ -246,7 +239,7 @@ class ShareController extends Controller {
}
// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
// after dispatching the request which results in a "Cannot modify header information" notice.
// after dispatching the request which results in a "Cannot modify header information" notice.
OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
exit();
} else {