summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Henriksson <andreas@fatal.se>2010-10-02 14:51:54 +0200
committerAndreas Henriksson <andreas@fatal.se>2010-10-04 14:00:13 +0200
commit4033907045abcf498686c1b34be7b0160260088d (patch)
treed700d806cb092aefad5d6c075b2a0ff75349231a
parent87ee853659e29b9074c3582890c7054a89167988 (diff)
downloadgvfs-4033907045abcf498686c1b34be7b0160260088d.tar.gz
sftp: fix poll() timeout.
When switching from select() to poll() in commit "sftp: Use poll() to cope with openssh-5.6 changes" (c6be45c8934) the difference in seconds vs milliseconds for select/poll timeout argument was missed. SFTP_READ_TIMEOUT is defined in seconds, so multiply it with 1000 when using it with poll(). https://bugzilla.gnome.org/show_bug.cgi?id=631169
-rw-r--r--daemon/gvfsbackendsftp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/gvfsbackendsftp.c b/daemon/gvfsbackendsftp.c
index 9fecf6a4..f6b77856 100644
--- a/daemon/gvfsbackendsftp.c
+++ b/daemon/gvfsbackendsftp.c
@@ -869,7 +869,7 @@ handle_login (GVfsBackend *backend,
fds[1].fd = prompt_fd;
fds[1].events = POLLIN;
- ret = poll(fds, 2, SFTP_READ_TIMEOUT);
+ ret = poll(fds, 2, SFTP_READ_TIMEOUT * 1000);
if (ret <= 0)
{