Merge branch '2.0'

This commit is contained in:
terrafrost 2017-05-07 13:26:39 -05:00
commit 84d40ad8e0

View File

@ -1907,7 +1907,14 @@ class SFTP extends SSH2
break;
case is_resource($data):
$mode = $mode & ~self::SOURCE_LOCAL_FILE;
$fp = $data;
$info = stream_get_meta_data($data);
if ($info['wrapper_type'] == 'PHP' && $info['stream_type'] == 'Input') {
$fp = fopen('php://memory', 'w+');
stream_copy_to_stream($data, $fp);
rewind($fp);
} else {
$fp = $data;
}
break;
case $mode & self::SOURCE_LOCAL_FILE:
if (!is_file($data)) {