Commit 9fa05db8 authored by James Housley's avatar James Housley
Browse files

The previous commit to force the use of libssh2-0.16 by removing 

LIBSSH2_APINO
parent 7ed58c46

lib/transfer.c

+2 −2
Original line number Diff line number Diff line
@@ -332,10 +332,10 @@ CURLcode Curl_readwrite(struct connectdata *conn, 


  if((k->keepon & (KEEP_READ|KEEP_READ_HOLD)) == KEEP_READ) {

    fd_read = conn->sockfd;

#if defined(USE_LIBSSH2) && defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)

#if defined(USE_LIBSSH2)

    if (conn->protocol & (PROT_SCP|PROT_SFTP))

      select_res |= CURL_CSELECT_IN;

#endif /* USE_LIBSSH2 && LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */

#endif /* USE_LIBSSH2 */

  } else

    fd_read = CURL_SOCKET_BAD;

lib/url.c

+0 −4
Original line number Diff line number Diff line
@@ -3446,10 +3446,8 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
    conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */

    conn->curl_do = Curl_scp_do;

    conn->curl_done = Curl_scp_done;

#if defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)

    conn->curl_connecting = Curl_ssh_multi_statemach;

    conn->curl_doing = Curl_scp_doing;

#endif /* LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */

    conn->curl_do_more = (Curl_do_more_func)ZERO_NULL;

#else

    failf(data, LIBCURL_NAME
@@ -3465,10 +3463,8 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
    conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */

    conn->curl_do = Curl_sftp_do;

    conn->curl_done = Curl_sftp_done;

#if defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)

    conn->curl_connecting = Curl_ssh_multi_statemach;

    conn->curl_doing = Curl_sftp_doing;

#endif /* LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */

    conn->curl_do_more = (Curl_do_more_func)ZERO_NULL;

#else

    failf(data, LIBCURL_NAME