rpms/gvfs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- FTP: Fix PASV connections

Browse Source
This commit is contained in:
Tomas Bzatek 2008-12-12 11:03:42 +00:00
parent 35890474c0
commit 4def88d1c4
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gvfs-1.1.1-ftp-pasv.patch Normal file
View File

@ -0,0 +1,24 @@
--- gvfs-1.1.1/daemon/gvfsbackendftp.c 2008-11-18 10:55:23.000000000 +0100
+++ gvfs-1.0.2/daemon/gvfsbackendftp.c 2008-12-11 23:55:51.000000000 +0100
@@ -937,14 +937,13 @@
addr = soup_address_new (ip, port1 << 8 | port2);
g_free (ip);
- connected = ftp_connection_open_data_connection (conn, addr);
- if (!connected)
- {
- /* set workaround flag (see below), so we don't try this again */
- DEBUG ("Successfull PASV response but data connection failed. Enabling FTP_WORKAROUND_PASV_ADDR.\n");
- conn->workarounds |= FTP_WORKAROUND_PASV_ADDR;
- g_clear_error (&conn->error);
- }
+ if (ftp_connection_open_data_connection (conn, addr))
+ return TRUE;
+
+ /* set workaround flag (see below), so we don't try this again */
+ DEBUG ("Successfull PASV response but data connection failed. Enabling FTP_WORKAROUND_PASV_ADDR.\n");
+ conn->workarounds |= FTP_WORKAROUND_PASV_ADDR;
+ g_clear_error (&conn->error);
}
/* Workaround code:

9
gvfs.spec
View File

@ -1,7 +1,7 @@
Summary: Backends for the gio framework in GLib Summary: Backends for the gio framework in GLib
Name: gvfs Name: gvfs
Version: 1.1.1 Version: 1.1.1
Release: 4%{?dist} Release: 5%{?dist}
License: LGPLv2+ License: LGPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.gtk.org URL: http://www.gtk.org
@ -35,6 +35,9 @@ Patch1: gvfs-0.99.2-archive-integration.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=524485 # http://bugzilla.gnome.org/show_bug.cgi?id=524485
Patch2: gvfs-smb-browse-auth.patch Patch2: gvfs-smb-browse-auth.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=564027
Patch3: gvfs-1.1.1-ftp-pasv.patch
%description %description
The gvfs package provides backend implementations for the gio The gvfs package provides backend implementations for the gio
@ -118,6 +121,7 @@ media players (Media Transfer Protocol) to applications using gvfs.
%setup -q %setup -q
%patch1 -p0 -b .archive-integration %patch1 -p0 -b .archive-integration
%patch2 -p0 -b .smb-auth %patch2 -p0 -b .smb-auth
%patch3 -p1 -b .ftp-pasv
%build %build
@ -258,6 +262,9 @@ update-desktop-database &> /dev/null ||:
%changelog %changelog
* Fri Dec 12 2008 Tomas Bzatek <tbzatek@redhat.com> - 1.1.1-5
- FTP: Fix PASV connections
* Tue Dec 9 2008 Tomas Bzatek <tbzatek@redhat.com> - 1.1.1-4 * Tue Dec 9 2008 Tomas Bzatek <tbzatek@redhat.com> - 1.1.1-4
- Add support for .tar.lzma archives in archive mounter - Add support for .tar.lzma archives in archive mounter