holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix wired error in scandir "(errno 115): Operation now in progress" caused by calling opendir with undefined context

Browse Source
This commit is contained in:
Ralf Becker 2016-01-22 13:55:37 +00:00
parent 2b10affe08
commit ddbf473642
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Vfs/StreamWrapper.php
View File

@ -327,7 +327,8 @@ class StreamWrapper implements StreamWrapperIface
{
return false;
}
if (!($this->opened_stream = fopen($url,$mode,false,$this->context)))
if (!($this->opened_stream = $this->context ?
fopen($url, $mode, false, $this->context) : fopen($url, $mode, false)))
{
return false;
}
@ -871,7 +872,8 @@ class StreamWrapper implements StreamWrapperIface
if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) resolve_url_symlinks() failed!");
return false;
}
if (!($this->opened_dir = opendir($this->opened_dir_url, $this->context)))
if (!($this->opened_dir = $this->context ?
opendir($this->opened_dir_url, $this->context) : opendir($this->opened_dir_url)))
{
if (self::LOG_LEVEL > 0) error_log(__METHOD__."( $path,$options) opendir($this->opened_dir_url) failed!");
return false;