mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2404 from nextcloud/streamresponse-warning 

prevent warning in StreamResponse
This commit is contained in:
Joas Schilling 2016-11-29 16:36:01 +01:00 committed by GitHub
parent f9271ebbd6 72a54ff9de
commit e86ea95043
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/public/AppFramework/Http/StreamResponse.php
View File

@ -54,7 +54,7 @@ class StreamResponse extends Response implements ICallbackResponse {
public function callback (IOutput $output) {
// handle caching
if ($output->getHttpResponseCode() !== Http::STATUS_NOT_MODIFIED) {
if (!(file_exists($this->filePath) || is_resource($this->filePath))) {
if (!(is_resource($this->filePath) || file_exists($this->filePath))) {
$output->setHttpResponseCode(Http::STATUS_NOT_FOUND);
} elseif ($output->setReadfile($this->filePath) === false) {
$output->setHttpResponseCode(Http::STATUS_BAD_REQUEST);