diff options
| author | James Housley <jim@thehousleys.net> | 2007-08-03 13:46:59 +0000 |
|---|---|---|
| committer | James Housley <jim@thehousleys.net> | 2007-08-03 13:46:59 +0000 |
| commit | 9fa05db83b104509bdbce7baa3fd46fba4b5e850 (patch) | |
| tree | 101054d498ea280e9744ab2f5f883edf82682205 | |
| parent | 7ed58c463604092013dd53d9313c21cd75b6a22f (diff) | |
| download | gnurl-9fa05db83b104509bdbce7baa3fd46fba4b5e850.tar.gz gnurl-9fa05db83b104509bdbce7baa3fd46fba4b5e850.tar.bz2 gnurl-9fa05db83b104509bdbce7baa3fd46fba4b5e850.zip | |
The previous commit to force the use of libssh2-0.16 by removing
LIBSSH2_APINO
| -rw-r--r-- | lib/transfer.c | 4 | ||||
| -rw-r--r-- | lib/url.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/transfer.c b/lib/transfer.c index efa8cdd02..f276dc0f8 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -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; @@ -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 |