52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
From acb3f8029d9f9a7054e3f138fd978e24233573a3 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Otte <otte@gnome.org>
|
|
Date: Wed, 17 Jun 2009 10:04:42 +0200
|
|
Subject: [PATCH 08/13] [FTP] use the EPRT feature response for EPRT support, not EPSV
|
|
|
|
---
|
|
daemon/gvfsbackendftp.c | 1 +
|
|
daemon/gvfsbackendftp.h | 1 +
|
|
daemon/gvfsftptask.c | 2 +-
|
|
3 files changed, 3 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
|
|
index 913eb1c..aef5687 100644
|
|
--- a/daemon/gvfsbackendftp.c
|
|
+++ b/daemon/gvfsbackendftp.c
|
|
@@ -99,6 +99,7 @@ gvfs_backend_ftp_determine_features (GVfsFtpTask *task)
|
|
{ "MDTM", G_VFS_FTP_FEATURE_MDTM },
|
|
{ "SIZE", G_VFS_FTP_FEATURE_SIZE },
|
|
{ "TVFS", G_VFS_FTP_FEATURE_TVFS },
|
|
+ { "EPRT", G_VFS_FTP_FEATURE_EPRT },
|
|
{ "EPSV", G_VFS_FTP_FEATURE_EPSV },
|
|
{ "UTF8", G_VFS_FTP_FEATURE_UTF8 },
|
|
};
|
|
diff --git a/daemon/gvfsbackendftp.h b/daemon/gvfsbackendftp.h
|
|
index 89b2769..0a7bcf5 100644
|
|
--- a/daemon/gvfsbackendftp.h
|
|
+++ b/daemon/gvfsbackendftp.h
|
|
@@ -34,6 +34,7 @@ typedef enum {
|
|
G_VFS_FTP_FEATURE_MDTM,
|
|
G_VFS_FTP_FEATURE_SIZE,
|
|
G_VFS_FTP_FEATURE_TVFS,
|
|
+ G_VFS_FTP_FEATURE_EPRT,
|
|
G_VFS_FTP_FEATURE_EPSV,
|
|
G_VFS_FTP_FEATURE_UTF8
|
|
} GVfsFtpFeature;
|
|
diff --git a/daemon/gvfsftptask.c b/daemon/gvfsftptask.c
|
|
index 9cab5a8..4c46c0c 100644
|
|
--- a/daemon/gvfsftptask.c
|
|
+++ b/daemon/gvfsftptask.c
|
|
@@ -970,7 +970,7 @@ g_vfs_ftp_task_setup_data_connection_any (GVfsFtpTask *task, GVfsFtpMethod unuse
|
|
} funcs_ordered[] = {
|
|
{ G_VFS_FTP_FEATURE_EPSV, g_vfs_ftp_task_setup_data_connection_epsv },
|
|
{ 0, g_vfs_ftp_task_setup_data_connection_pasv },
|
|
- { G_VFS_FTP_FEATURE_EPSV, g_vfs_ftp_task_setup_data_connection_eprt },
|
|
+ { G_VFS_FTP_FEATURE_EPRT, g_vfs_ftp_task_setup_data_connection_eprt },
|
|
{ 0, g_vfs_ftp_task_setup_data_connection_port }
|
|
};
|
|
GVfsFtpMethod method;
|
|
--
|
|
1.6.3.2
|
|
|