a3e77b68ce
- better patch (not only) for SCP/SFTP polling - improve error message for not matching common name (#516056)
116 lines
4.2 KiB
Diff
116 lines
4.2 KiB
Diff
diff -rup curl-7.19.6.orig/lib/ssh.c curl-7.19.6/lib/ssh.c
|
|
--- curl-7.19.6.orig/lib/ssh.c 2009-07-25 00:21:50.000000000 +0200
|
|
+++ curl-7.19.6/lib/ssh.c 2009-09-02 15:43:13.337644271 +0200
|
|
@@ -2235,10 +2235,10 @@ static int ssh_perform_getsock(const str
|
|
|
|
sock[0] = conn->sock[FIRSTSOCKET];
|
|
|
|
- if(conn->proto.sshc.waitfor & KEEP_RECV)
|
|
+ if(conn->waitfor & KEEP_RECV)
|
|
bitmap |= GETSOCK_READSOCK(FIRSTSOCKET);
|
|
|
|
- if(conn->proto.sshc.waitfor & KEEP_SEND)
|
|
+ if(conn->waitfor & KEEP_SEND)
|
|
bitmap |= GETSOCK_WRITESOCK(FIRSTSOCKET);
|
|
|
|
return bitmap;
|
|
@@ -2282,15 +2282,17 @@ static void ssh_block2waitfor(struct con
|
|
{
|
|
struct ssh_conn *sshc = &conn->proto.sshc;
|
|
int dir;
|
|
- if(block && (dir = libssh2_session_block_directions(sshc->ssh_session))) {
|
|
+ if(!block)
|
|
+ conn->waitfor = 0;
|
|
+ else if((dir = libssh2_session_block_directions(sshc->ssh_session))) {
|
|
/* translate the libssh2 define bits into our own bit defines */
|
|
- sshc->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) |
|
|
+ conn->waitfor = ((dir&LIBSSH2_SESSION_BLOCK_INBOUND)?KEEP_RECV:0) |
|
|
((dir&LIBSSH2_SESSION_BLOCK_OUTBOUND)?KEEP_SEND:0);
|
|
}
|
|
else
|
|
/* It didn't block or libssh2 didn't reveal in which direction, put back
|
|
the original set */
|
|
- sshc->waitfor = sshc->orig_waitfor;
|
|
+ conn->waitfor = sshc->orig_waitfor;
|
|
}
|
|
#else
|
|
/* no libssh2 directional support so we simply don't know */
|
|
diff -rup curl-7.19.6.orig/lib/transfer.c curl-7.19.6/lib/transfer.c
|
|
--- curl-7.19.6.orig/lib/transfer.c 2009-07-22 22:09:53.000000000 +0200
|
|
+++ curl-7.19.6/lib/transfer.c 2009-09-02 15:43:13.338644150 +0200
|
|
@@ -1884,33 +1884,46 @@ Transfer(struct connectdata *conn)
|
|
return CURLE_OK;
|
|
|
|
while(!done) {
|
|
- curl_socket_t fd_read;
|
|
- curl_socket_t fd_write;
|
|
+ curl_socket_t fd_read = conn->sockfd;
|
|
+ curl_socket_t fd_write = conn->writesockfd;
|
|
+ int keepon = k->keepon;
|
|
+
|
|
+#if defined(USE_LIBSSH2)
|
|
+ if(conn->protocol & (PROT_SCP|PROT_SFTP)) {
|
|
+ fd_read = conn->sock[FIRSTSOCKET];
|
|
+ fd_write = conn->sock[FIRSTSOCKET];
|
|
+ }
|
|
+#endif /* USE_LIBSSH2 */
|
|
+
|
|
+ if(conn->waitfor) {
|
|
+ /* if waitfor is set, get the RECV and SEND bits from that but keep the
|
|
+ other bits */
|
|
+ keepon &= ~ (KEEP_RECV|KEEP_SEND);
|
|
+ keepon |= conn->waitfor & (KEEP_RECV|KEEP_SEND);
|
|
+ }
|
|
|
|
/* limit-rate logic: if speed exceeds threshold, then do not include fd in
|
|
select set. The current speed is recalculated in each Curl_readwrite()
|
|
call */
|
|
- if((k->keepon & KEEP_SEND) &&
|
|
+ if((keepon & KEEP_SEND) &&
|
|
(!data->set.max_send_speed ||
|
|
(data->progress.ulspeed < data->set.max_send_speed) )) {
|
|
- fd_write = conn->writesockfd;
|
|
k->keepon &= ~KEEP_SEND_HOLD;
|
|
}
|
|
else {
|
|
fd_write = CURL_SOCKET_BAD;
|
|
- if(k->keepon & KEEP_SEND)
|
|
+ if(keepon & KEEP_SEND)
|
|
k->keepon |= KEEP_SEND_HOLD; /* hold it */
|
|
}
|
|
|
|
- if((k->keepon & KEEP_RECV) &&
|
|
+ if((keepon & KEEP_RECV) &&
|
|
(!data->set.max_recv_speed ||
|
|
(data->progress.dlspeed < data->set.max_recv_speed)) ) {
|
|
- fd_read = conn->sockfd;
|
|
k->keepon &= ~KEEP_RECV_HOLD;
|
|
}
|
|
else {
|
|
fd_read = CURL_SOCKET_BAD;
|
|
- if(k->keepon & KEEP_RECV)
|
|
+ if(keepon & KEEP_RECV)
|
|
k->keepon |= KEEP_RECV_HOLD; /* hold it */
|
|
}
|
|
|
|
diff -rup curl-7.19.6.orig/lib/urldata.h curl-7.19.6/lib/urldata.h
|
|
--- curl-7.19.6.orig/lib/urldata.h 2009-07-23 00:49:56.000000000 +0200
|
|
+++ curl-7.19.6/lib/urldata.h 2009-09-02 15:43:13.339644227 +0200
|
|
@@ -565,7 +565,6 @@ struct ssh_conn {
|
|
LIBSSH2_CHANNEL *ssh_channel; /* Secure Shell channel handle */
|
|
LIBSSH2_SFTP *sftp_session; /* SFTP handle */
|
|
LIBSSH2_SFTP_HANDLE *sftp_handle;
|
|
- int waitfor; /* current READ/WRITE bits to wait for */
|
|
int orig_waitfor; /* default READ/WRITE bits wait for */
|
|
|
|
/* note that HAVE_LIBSSH2_KNOWNHOST_API is a define set in the libssh2.h
|
|
@@ -1070,6 +1069,8 @@ struct connectdata {
|
|
} proto;
|
|
|
|
int cselect_bits; /* bitmask of socket events */
|
|
+ int waitfor; /* current READ/WRITE bits to wait for */
|
|
+
|
|
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
|
|
int socks5_gssapi_enctype;
|
|
#endif
|