aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--sshfs.c22
2 files changed, 6 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index dba14eb..7d7381d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,12 @@ Unreleased Changes
* Added support for building with Meson.
* Added support for more SSH options.
-* Dropped support for the *nodelay* workaround.
-
-
+* Dropped support for the *nodelay* workaround - the last OpenSSH
+ version for which this was useful was released in 2006.
+* Dropped support for the *nodelaysrv* workaround. The same effect
+ (enabling NODELAY on the server side *and* enabling X11 forwarding)
+ can be achieved by explicitly passing `-o ForwardX11`
+
Release 2.9 (2017-04-17)
------------------------
diff --git a/sshfs.c b/sshfs.c
index 93aec3d..03e824b 100644
--- a/sshfs.c
+++ b/sshfs.c
@@ -214,7 +214,6 @@ struct sshfs {
struct fuse_args ssh_args;
char *workarounds;
int rename_workaround;
- int nodelaysrv_workaround;
int truncate_workaround;
int buflimit_workaround;
int fstat_workaround;
@@ -420,19 +419,15 @@ static struct fuse_opt sshfs_opts[] = {
static struct fuse_opt workaround_opts[] = {
SSHFS_OPT("none", rename_workaround, 0),
- SSHFS_OPT("none", nodelaysrv_workaround, 0),
SSHFS_OPT("none", truncate_workaround, 0),
SSHFS_OPT("none", buflimit_workaround, 0),
SSHFS_OPT("none", fstat_workaround, 0),
SSHFS_OPT("all", rename_workaround, 1),
- SSHFS_OPT("all", nodelaysrv_workaround, 1),
SSHFS_OPT("all", truncate_workaround, 1),
SSHFS_OPT("all", buflimit_workaround, 1),
SSHFS_OPT("all", fstat_workaround, 1),
SSHFS_OPT("rename", rename_workaround, 1),
SSHFS_OPT("norename", rename_workaround, 0),
- SSHFS_OPT("nodelaysrv", nodelaysrv_workaround, 1),
- SSHFS_OPT("nonodelaysrv", nodelaysrv_workaround, 0),
SSHFS_OPT("truncate", truncate_workaround, 1),
SSHFS_OPT("notruncate", truncate_workaround, 0),
SSHFS_OPT("buflimit", buflimit_workaround, 1),
@@ -1018,21 +1013,6 @@ static int start_ssh(void)
} else if (pid == 0) {
int devnull;
- if (sshfs.nodelaysrv_workaround) {
- int i;
- /*
- * Hack to work around missing TCP_NODELAY
- * setting in sshd
- */
- for (i = 1; i < sshfs.ssh_args.argc; i++) {
- if (strcmp(sshfs.ssh_args.argv[i], "-x") == 0) {
- replace_arg(&sshfs.ssh_args.argv[i],
- "-X");
- break;
- }
- }
- }
-
devnull = open("/dev/null", O_WRONLY);
if (dup2(sockpair[1], 0) == -1 || dup2(sockpair[1], 1) == -1) {
@@ -3340,7 +3320,6 @@ static void usage(const char *progname)
" none no workarounds enabled\n"
" all all workarounds enabled\n"
" [no]rename fix renaming to existing file (default: off)\n"
-" [no]nodelaysrv set nodelay tcp flag in sshd (default: off)\n"
" [no]truncate fix truncate for old servers (default: off)\n"
" [no]buflimit fix buffer fillup bug in server (default: on)\n"
" -o idmap=TYPE user/group ID mapping (default: " IDMAP_DEFAULT ")\n"
@@ -3876,7 +3855,6 @@ int main(int argc, char *argv[])
/* SFTP spec says all servers should allow at least 32k I/O */
sshfs.max_read = 32768;
sshfs.max_write = 32768;
- sshfs.nodelaysrv_workaround = 0;
#ifdef __APPLE__
sshfs.rename_workaround = 1;
#else