tool
/
sshfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable buflimit workaround 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.
This commit is contained in:
Nikolaus Rath 2019-11-27 10:29:46 +00:00
parent 28c22270f8
commit e910453156
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog.rst
View File

@ -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)
--------------------------

4
sshfs.c
View File

@ -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"
@ -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];

3
test/test_sshfs.py
View File

@ -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