Merge branch '2.0'

This commit is contained in:
terrafrost 2016-07-10 13:22:09 -05:00
commit f7585d99d1

View File

@ -603,6 +603,21 @@ class SFTP extends SSH2
}
}
/**
* Returns canonicalized absolute pathname
*
* realpath() expands all symbolic links and resolves references to '/./', '/../' and extra '/' characters in the input
* path and returns the canonicalized absolute pathname.
*
* @param string $path
* @return mixed
* @access public
*/
function realpath($path)
{
return $this->_realpath($path);
}
/**
* Canonicalize the Server-Side Path Name
*
@ -1625,7 +1640,7 @@ class SFTP extends SSH2
return false;
}
$target = $this->_realpath($target);
//$target = $this->_realpath($target);
$link = $this->_realpath($link);
$packet = pack('Na*Na*', strlen($target), $target, strlen($link), $link);