Merge branch 'master' into php5

* master:
  Do not check filename over and over again, remove '.' and '..' from the map instead.
This commit is contained in:
Andreas Fischer 2014-07-24 17:32:38 +02:00
commit bb1c36893f

View File

@ -1516,11 +1516,8 @@ class Net_SFTP extends Net_SSH2
return false;
}
unset($entries['.'], $entries['..']);
foreach ($entries as $filename=>$props) {
if ($filename == '.' || $filename == '..') {
continue;
}
if (!isset($props['type'])) {
return false;
}
@ -2148,11 +2145,8 @@ class Net_SFTP extends Net_SSH2
return false;
}
unset($entries['.'], $entries['..']);
foreach ($entries as $filename=>$props) {
if ($filename == '.' || $filename == '..') {
continue;
}
if (!isset($props['type'])) {
return false;
}