Skip to content

Commit

Permalink
Disable buflimit workaround by default.
Browse files Browse the repository at this point in the history
The corresponding bug in OpenSSH has been fixed in
2007 (cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=365541#37), so this shouldn't
be needed anymore.
  • Loading branch information
Nikratio committed Nov 27, 2019
1 parent 28c2227 commit e910453
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
7 changes: 7 additions & 0 deletions ChangeLog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ Unreleased Changes
during large file transfers. Thanks to Timo Savola for doing most of the implementation
work, and thanks to CEA.fr for sponsoring remaining bugfixes and cleanups!

* The `buflimit` workaround is now disabled by default. The corresponding bug in OpenSSH
has been fixed in 2007
(cf. https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=365541#37), so this shouldn't be
needed anymore. If you depend on this workaround, please let the SSHFS maintainers know,
otherwise support for the workaround will be removed completely in a future version.


Release 3.6.0 (2019-11-03)
--------------------------

Expand Down
4 changes: 2 additions & 2 deletions sshfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -3584,7 +3584,7 @@ static void usage(const char *progname)
" [no]rename fix renaming to existing file (default: off)\n"
" [no]renamexdev fix moving across filesystems (default: off)\n"
" [no]truncate fix truncate for old servers (default: off)\n"
" [no]buflimit fix buffer fillup bug in server (default: on)\n"
" [no]buflimit fix buffer fillup bug in server (default: off)\n"
" [no]fstat always use stat() instead of fstat() (default: off)\n"
" [no]createmode always pass mode 0 to create (default: off)\n"
" -o idmap=TYPE user/group ID mapping (default: " IDMAP_DEFAULT ")\n"
Expand Down Expand Up @@ -4142,7 +4142,7 @@ int main(int argc, char *argv[])
#endif
sshfs.renamexdev_workaround = 0;
sshfs.truncate_workaround = 0;
sshfs.buflimit_workaround = 1;
sshfs.buflimit_workaround = 0;
sshfs.createmode_workaround = 0;
sshfs.ssh_ver = 2;
sshfs.progname = argv[0];
Expand Down
3 changes: 1 addition & 2 deletions test/test_sshfs.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,7 @@ def test_sshfs(tmpdir, debug, cache_timeout, sync_rd, multiconn, capfd):
'-o', 'attr_timeout=0' ]

if multiconn:
cmdline += [ '-o', 'max_conns=3',
'-o', 'workaround=nobuflimit' ]
cmdline += [ '-o', 'max_conns=3' ]

new_env = dict(os.environ) # copy, don't modify

Expand Down

0 comments on commit e910453

Please sign in to comment.