Merge branch 'master' into php5

* master:
  Fix Net_SFTP::filetype() block device recognition.
This commit is contained in:
Andreas Fischer 2014-10-09 23:19:23 +02:00
commit 645c16d0f5

View File

@ -2367,7 +2367,7 @@ class Net_SFTP extends Net_SSH2
}
switch ($type) {
case NET_SFTP_BLOCK_DEVICE: return 'block';
case NET_SFTP_TYPE_BLOCK_DEVICE: return 'block';
case NET_SFTP_TYPE_CHAR_DEVICE: return 'char';
case NET_SFTP_TYPE_DIRECTORY: return 'dir';
case NET_SFTP_TYPE_FIFO: return 'fifo';