Commit d015f4cc authored by Kamil Dudka's avatar Kamil Dudka Committed by Daniel Stenberg
Browse files

ssh: improve the logic for detecting blocking direction 

This fixes a regression introduced by commit 0feeab78 limiting the speed
of SCP upload to 16384 B/s on a fast connection (such as localhost).
parent 143d7c13

RELEASE-NOTES

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ This release includes the following bugfixes: 
 o win32: fix Visual Studio 2010 build with WINVER >= 0x600 [22]

 o configure: use icc options without space [21]

 o test1112: Increase the timeout from 7s to 16s [20]

 o SCP: upload speed on a fast connection limited to 16384 B/s



This release includes the following known bugs:

lib/ssh.c

+5 −3
Original line number Diff line number Diff line
@@ -2288,6 +2288,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) 
        sshc->actualcode = result;

      }

      else {

        /* store this original bitmask setup to use later on if we can't

           figure out a "real" bitmask */

        sshc->orig_waitfor = data->req.keepon;



        /* we want to use the _sending_ function even when the socket turns

           out readable as the underlying libssh2 scp send function will deal

           with both accordingly */
@@ -2604,9 +2608,7 @@ static void ssh_block2waitfor(struct connectdata *conn, bool block) 
{

  struct ssh_conn *sshc = &conn->proto.sshc;

  int dir;

  if(!block)

    conn->waitfor = 0;

  else if((dir = libssh2_session_block_directions(sshc->ssh_session))) {

  if(block && (dir = libssh2_session_block_directions(sshc->ssh_session))) {

    /* translate the libssh2 define bits into our own bit defines */

    conn->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) |

      ((dir&LIBSSH2_SESSION_BLOCK_OUTBOUND)?KEEP_SEND:0);