generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
LIBSSH2_APINO
This commit is contained in:
James Housley 2007-08-03 13:46:59 +00:00
parent 7ed58c4636
commit 9fa05db83b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/transfer.c
View File

@ -332,10 +332,10 @@ CURLcode Curl_readwrite(struct connectdata *conn,
if((k->keepon & (KEEP_READ|KEEP_READ_HOLD)) == KEEP_READ) { if((k->keepon & (KEEP_READ|KEEP_READ_HOLD)) == KEEP_READ) {
fd_read = conn->sockfd; 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)) if (conn->protocol & (PROT_SCP|PROT_SFTP))
select_res |= CURL_CSELECT_IN; select_res |= CURL_CSELECT_IN;
#endif /* USE_LIBSSH2 && LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */ #endif /* USE_LIBSSH2 */
} else } else
fd_read = CURL_SOCKET_BAD; fd_read = CURL_SOCKET_BAD;

4
lib/url.c
View File

@ -3446,10 +3446,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */ conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */
conn->curl_do = Curl_scp_do; conn->curl_do = Curl_scp_do;
conn->curl_done = Curl_scp_done; conn->curl_done = Curl_scp_done;
#if defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)
conn->curl_connecting = Curl_ssh_multi_statemach; conn->curl_connecting = Curl_ssh_multi_statemach;
conn->curl_doing = Curl_scp_doing; conn->curl_doing = Curl_scp_doing;
#endif /* LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */
conn->curl_do_more = (Curl_do_more_func)ZERO_NULL; conn->curl_do_more = (Curl_do_more_func)ZERO_NULL;
#else #else
failf(data, LIBCURL_NAME failf(data, LIBCURL_NAME
@ -3465,10 +3463,8 @@ static CURLcode CreateConnection(struct SessionHandle *data,
conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */ conn->curl_connect = Curl_ssh_connect; /* ssh_connect? */
conn->curl_do = Curl_sftp_do; conn->curl_do = Curl_sftp_do;
conn->curl_done = Curl_sftp_done; conn->curl_done = Curl_sftp_done;
#if defined(LIBSSH2_APINO) && (LIBSSH2_APINO >= 200706012030L)
conn->curl_connecting = Curl_ssh_multi_statemach; conn->curl_connecting = Curl_ssh_multi_statemach;
conn->curl_doing = Curl_sftp_doing; conn->curl_doing = Curl_sftp_doing;
#endif /* LIBSSH2_APINO && (LIBSSH2_APINO >= 200706012030L) */
conn->curl_do_more = (Curl_do_more_func)ZERO_NULL; conn->curl_do_more = (Curl_do_more_func)ZERO_NULL;
#else #else
failf(data, LIBCURL_NAME failf(data, LIBCURL_NAME