diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | daemon/gvfsbackendftp.c | 15 |
2 files changed, 16 insertions, 8 deletions
@@ -1,3 +1,12 @@ +2008-12-12 Andreas Henriksson <andreas@fatal.se> + + reviewed by: Benjamin Otte <otte@gnome.org> + + * daemon/gvfsbackendftp.c: + (ftp_connection_ensure_data_connection_pasv): + Fix successful PASV connections (don't try to apply workaround). + (fixes #564027) + 2008-12-11 Ryan Lortie <desrt@desrt.ca> Implement pull support on trash backend. diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c index b62461b0..e80e464a 100644 --- a/daemon/gvfsbackendftp.c +++ b/daemon/gvfsbackendftp.c @@ -937,14 +937,13 @@ ftp_connection_ensure_data_connection_pasv (FtpConnection *conn) 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: |