rpms/gvfs/F-11 gvfs-1.2.3-sftp-40sec-timeout.patch, NONE, 1.1 gvfs.spec, 1.133, 1.134

[Tomas Bzatek]

Author: tbzatek

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

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.2.3-3
- 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-11/gvfs.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -p -r1.133 -r1.134
--- gvfs.spec	18 May 2009 14:14:18 -0000	1.133
+++ gvfs.spec	8 Jun 2009 15:23:12 -0000	1.134
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 1.2.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -37,6 +37,9 @@ Patch3: gvfs-1.2.2-dnssd-deadlock.patch
 # Unable to Play Audio CDs 
 # https://bugzilla.redhat.com/show_bug.cgi?id=499266 
 Patch4: gvfs-1.2.3-cdda-allow-query-well-formed-filenames-only.patch
+# SFTP timeout too short
+# https://bugzilla.redhat.com/show_bug.cgi?id=504339
+Patch5: gvfs-1.2.3-sftp-40sec-timeout.patch
 
 # Gdu volume monitor patches, from http://cgit.freedesktop.org/~david/gvfs/log/?h=gdu-volume-monitor
 #
@@ -160,6 +163,7 @@ media players (Media Transfer Protocol) 
 %patch2 -p1 -b .computer-expose-devices
 %patch3 -p1 -b .dnssd-deadlock
 %patch4 -p1 -b .cdda-query
+%patch5 -p1 -b .sftp-timeout
 
 %patch101 -p1 -b .gdu-volume-monitor
 %patch102 -p1 -b .gdu-volumes-typo
@@ -321,6 +325,9 @@ update-desktop-database &> /dev/null ||:
 
 
 %changelog
+* Mon Jun  8 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-3
+- SFTP: Increase timeout (#504339)
+
 * Mon May 18 2009 Tomas Bzatek <tbzatek at redhat.com> - 1.2.3-2
 - CDDA: allow query well-formed filenames only (#499266)