rpms/gvfs/F-10 gvfs-1.2.3-sftp-40sec-timeout.patch, NONE, 1.1 gvfs.spec, 1.99, 1.100

[Tomas Bzatek]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24212

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-1.2.3-sftp-40sec-timeout.patch 
Log Message:
* Mon Jun  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-9
- SFTP: Increase timeout (#504339)


gvfs-1.2.3-sftp-40sec-timeout.patch:

--- NEW FILE gvfs-1.2.3-sftp-40sec-timeout.patch ---
diff -up gvfs-1.2.3/daemon/gvfsbackendsftp.c.orig gvfs-1.2.3/daemon/gvfsbackendsftp.c
--- gvfs-1.2.3/daemon/gvfsbackendsftp.c.orig	2009-04-20 12:41:37.000000000 +0200
+++ gvfs-1.2.3/daemon/gvfsbackendsftp.c	2009-06-08 16:22:08.000000000 +0200
@@ -74,6 +74,8 @@
 #define USE_PTY 1
 #endif
 
+#define SFTP_READ_TIMEOUT 40   /* seconds */
+
 static GQuark id_q;
 
 typedef enum {
@@ -598,7 +600,7 @@ wait_for_reply (GVfsBackend *backend, in
   FD_ZERO (&ifds);
   FD_SET (stdout_fd, &ifds);
   
-  tv.tv_sec = 20;
+  tv.tv_sec = SFTP_READ_TIMEOUT;
   tv.tv_usec = 0;
       
   ret = select (stdout_fd+1, &ifds, NULL, NULL, &tv);
@@ -859,7 +861,7 @@ handle_login (GVfsBackend *backend,
       FD_SET (stdout_fd, &ifds);
       FD_SET (prompt_fd, &ifds);
       
-      tv.tv_sec = 20;
+      tv.tv_sec = SFTP_READ_TIMEOUT;
       tv.tv_usec = 0;
       
       ret = select (MAX (stdout_fd, prompt_fd)+1, &ifds, NULL, NULL, &tv);


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/F-10/gvfs.spec,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -p -r1.99 -r1.100
--- gvfs.spec	6 May 2009 16:40:26 -0000	1.99
+++ gvfs.spec	8 Jun 2009 15:43:19 -0000	1.100
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.0.3
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -70,6 +70,10 @@ Patch14: gvfs-1.1.8-sftp-eating-cpu.patc
 # https://bugzilla.redhat.com/show_bug.cgi?id=499286
 Patch15: gvfs-1.2.3-ftp-filesize.patch
 
+# SFTP timeout too short
+# https://bugzilla.redhat.com/show_bug.cgi?id=504339
+Patch16: gvfs-1.2.3-sftp-40sec-timeout.patch
+
 %description
 The gvfs package provides backend implementations for the gio 
 framework in GLib. It includes ftp, sftp, cifs. 
@@ -165,6 +169,7 @@ popd
 %patch13 -p0 -b .sftp-keys
 %patch14 -p0 -b .sftp-cpu
 %patch15 -p1 -b .ftp-size
+%patch16 -p1 -b .sftp-timeout
 
 
 %build
@@ -303,6 +308,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Jun  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-9
+- SFTP: Increase timeout (#504339)
+
 * Wed May 06 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.0.3-8
 - FTP: fix 32-bit file size string conversion (#499286)