1
0
mirror of https://github.com/moparisthebest/curl synced 2024-11-04 08:35:05 -05:00

smb_getsock: always wait for write socket too

... the protocol is doing read/write a lot, so it needs to write often
even when downloading. A more proper fix could check for eactly when it
wants to write and only ask for it then.

Without this fix, an SMB download could easily get stuck when the event-driven
API was used.

Closes #2768
This commit is contained in:
Daniel Stenberg 2018-07-20 00:57:28 +02:00
parent 7bc1180437
commit 73af7bcd61
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2

View File

@ -941,17 +941,11 @@ static CURLcode smb_disconnect(struct connectdata *conn, bool dead)
static int smb_getsock(struct connectdata *conn, curl_socket_t *socks,
int numsocks)
{
struct smb_conn *smbc = &conn->proto.smbc;
if(!numsocks)
return GETSOCK_BLANK;
socks[0] = conn->sock[FIRSTSOCKET];
if(smbc->send_size || smbc->upload_size)
return GETSOCK_WRITESOCK(0);
return GETSOCK_READSOCK(0);
return GETSOCK_READSOCK(0) | GETSOCK_WRITESOCK(0);
}
static CURLcode smb_parse_url_path(struct connectdata *conn)