summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2008-07-14 11:29:24 +1000
committerDamien Miller <djm@mindrot.org>2008-07-14 11:29:24 +1000
commit7f980d1ac760ac7bdec1de467c6ee7071057370a (patch)
treecf61aa77f3ef11e2dc435b0f62c742e4e67e831b
parent163886ff7170f031b59b36d0a76165757d680070 (diff)
- djm@cvs.openbsd.org 2008/07/13 22:16:03
[sftp.c] increase number of piplelined requests so they properly fill the (recently increased) channel window. prompted by rapier AT psc.edu; ok markus@
-rw-r--r--ChangeLog7
-rw-r--r--sftp.c4
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 45b878ad6..caefabaf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@
10 [channels.c] 10 [channels.c]
11 use struct sockaddr_storage instead of struct sockaddr for accept(2) 11 use struct sockaddr_storage instead of struct sockaddr for accept(2)
12 address argument. from visibilis AT yahoo.com in bz#1485; ok markus@ 12 address argument. from visibilis AT yahoo.com in bz#1485; ok markus@
13 - djm@cvs.openbsd.org 2008/07/13 22:16:03
14 [sftp.c]
15 increase number of piplelined requests so they properly fill the
16 (recently increased) channel window. prompted by rapier AT psc.edu;
17 ok markus@
13 18
1420080712 1920080712
15 - (djm) OpenBSD CVS Sync 20 - (djm) OpenBSD CVS Sync
@@ -4646,4 +4651,4 @@
4646 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4651 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4647 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4652 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4648 4653
4649$Id: ChangeLog,v 1.5077 2008/07/14 01:28:58 djm Exp $ 4654$Id: ChangeLog,v 1.5078 2008/07/14 01:29:24 djm Exp $
diff --git a/sftp.c b/sftp.c
index f361378ee..e1aa49d0f 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.102 2008/06/21 07:46:46 martynas Exp $ */ 1/* $OpenBSD: sftp.c,v 1.103 2008/07/13 22:16:03 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 *
@@ -75,7 +75,7 @@ int batchmode = 0;
75size_t copy_buffer_len = 32768; 75size_t copy_buffer_len = 32768;
76 76
77/* Number of concurrent outstanding requests */ 77/* Number of concurrent outstanding requests */
78size_t num_requests = 16; 78size_t num_requests = 64;
79 79
80/* PID of ssh transport process */ 80/* PID of ssh transport process */
81static pid_t sshpid = -1; 81static pid_t sshpid = -1;