moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "libssh: no data pointer == nothing to do" 

This reverts commit c98ee5f67f since commit f3ce38739f fixed the
problem in a more generic way.
This commit is contained in:
Daniel Stenberg 2018-12-23 17:40:46 +01:00
parent f3ce38739f
commit 7608f9a2d5
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ssh-libssh.c
View File

@ -554,19 +554,14 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block)
{
CURLcode result = CURLE_OK;
struct Curl_easy *data = conn->data;
struct SSHPROTO *protop;
struct SSHPROTO *protop = data->req.protop;
struct ssh_conn *sshc = &conn->proto.sshc;
int rc = SSH_NO_ERROR, err;
char *new_readdir_line;
int seekerr = CURL_SEEKFUNC_OK;
const char *err_msg;
*block = 0; /* we're not blocking by default */
if(!data) {
state(conn, SSH_STOP);
return CURLE_OK;
}
protop = data->req.protop;
do {
switch(sshc->state) {
@ -1993,10 +1988,6 @@ static CURLcode myssh_block_statemach(struct connectdata *conn,
struct ssh_conn *sshc = &conn->proto.sshc;
CURLcode result = CURLE_OK;
struct Curl_easy *data = conn->data;
if(!data) {
state(conn, SSH_STOP);
return CURLE_OK;
}
while((sshc->state != SSH_STOP) && !result) {
bool block;