|
 |
c260e0 |
From 2e973be50f75d0a85dcb995f7823f00b1fc85c2f Mon Sep 17 00:00:00 2001
|
|
|
c260e0 |
From: Kamil Dudka <kdudka@redhat.com>
|
|
|
c260e0 |
Date: Mon, 7 Oct 2013 16:07:50 +0200
|
|
|
c260e0 |
Subject: [PATCH] ssh: improve the logic for detecting blocking direction
|
|
|
c260e0 |
|
|
|
c260e0 |
This fixes a regression introduced by commit 0feeab78 limiting the speed
|
|
|
c260e0 |
of SCP upload to 16384 B/s on a fast connection (such as localhost).
|
|
|
c260e0 |
|
|
|
c260e0 |
[upstream commit d015f4ccac627852869cb45e31ccdc9fbd97dc47]
|
|
|
c260e0 |
---
|
|
|
c260e0 |
lib/ssh.c | 8 +++++---
|
|
|
c260e0 |
1 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
c260e0 |
|
|
|
c260e0 |
diff --git a/lib/ssh.c b/lib/ssh.c
|
|
|
c260e0 |
index 422357b..93c65c3 100644
|
|
|
c260e0 |
--- a/lib/ssh.c
|
|
|
c260e0 |
+++ b/lib/ssh.c
|
|
|
c260e0 |
@@ -2287,6 +2287,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block)
|
|
|
c260e0 |
sshc->actualcode = result;
|
|
|
c260e0 |
}
|
|
|
c260e0 |
else {
|
|
|
c260e0 |
+ /* store this original bitmask setup to use later on if we can't
|
|
|
c260e0 |
+ figure out a "real" bitmask */
|
|
|
c260e0 |
+ sshc->orig_waitfor = data->req.keepon;
|
|
|
c260e0 |
+
|
|
|
c260e0 |
/* we want to use the _sending_ function even when the socket turns
|
|
|
c260e0 |
out readable as the underlying libssh2 scp send function will deal
|
|
|
c260e0 |
with both accordingly */
|
|
|
c260e0 |
@@ -2603,9 +2607,7 @@ static void ssh_block2waitfor(struct connectdata *conn, bool block)
|
|
|
c260e0 |
{
|
|
|
c260e0 |
struct ssh_conn *sshc = &conn->proto.sshc;
|
|
|
c260e0 |
int dir;
|
|
|
c260e0 |
- if(!block)
|
|
|
c260e0 |
- conn->waitfor = 0;
|
|
|
c260e0 |
- else if((dir = libssh2_session_block_directions(sshc->ssh_session))) {
|
|
|
c260e0 |
+ if(block && (dir = libssh2_session_block_directions(sshc->ssh_session))) {
|
|
|
c260e0 |
/* translate the libssh2 define bits into our own bit defines */
|
|
|
c260e0 |
conn->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) |
|
|
|
c260e0 |
((dir&LIBSSH2_SESSION_BLOCK_OUTBOUND)?KEEP_SEND:0);
|
|
|
c260e0 |
--
|
|
|
c260e0 |
1.7.1
|
|
|
c260e0 |
|