diff options
author | djm@openbsd.org <djm@openbsd.org> | 2020-05-15 03:57:33 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2020-05-27 10:09:19 +1000 |
commit | af8b16fb2cce880341c0ee570ceb0d84104bdcc0 (patch) | |
tree | 717c4e3e9ab19f1ac723acf3f6853cb9b3602961 /sftp-client.c | |
parent | d7d753e2979f2d3c904b03a08d30856cd2a6e892 (diff) |
upstream: fix off-by-one error that caused sftp downloads to make
one more concurrent request that desired. This prevented using sftp(1) in
unpipelined request/response mode, which is useful when debugging. Patch from
Stephen Goetze in bz#3054
OpenBSD-Commit-ID: 41b394ebe57037dbc43bdd0eef21ff0511191f28
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sftp-client.c b/sftp-client.c index 72f7fff7a..b8e131be6 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.135 2019/10/04 04:31:59 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.136 2020/05/15 03:57:33 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1415,7 +1415,7 @@ do_download(struct sftp_conn *conn, const char *remote_path, | |||
1415 | (unsigned long long)offset, | 1415 | (unsigned long long)offset, |
1416 | num_req); | 1416 | num_req); |
1417 | max_req = 1; | 1417 | max_req = 1; |
1418 | } else if (max_req <= conn->num_requests) { | 1418 | } else if (max_req < conn->num_requests) { |
1419 | ++max_req; | 1419 | ++max_req; |
1420 | } | 1420 | } |
1421 | } | 1421 | } |