From: Ales Novak <alnovak@suse.cz>
Date: Tue, 23 Aug 2016 12:13:18 +0000 (+0200)
Subject: ftp: fix wrong poll on the secondary socket
X-Git-Tag: curl-7_50_2~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ad50a61f28f773ad2d2f03031423da81bfb69fe;p=curl

ftp: fix wrong poll on the secondary socket

When we're uploading using FTP and the server issues a tiny pause
between opening the connection to the client's secondary socket, the
client's initial poll() times out, which leads to second poll() which
does not wait for POLLIN on the secondary socket. So that poll() also
has to time out, creating a long (200ms) pause.

This patch adds the correct flag to the secondary socket, making the
second poll() correctly wait for the connection there too.

Signed-off-by: Ales Novak <alnovak@suse.cz>

Closes #978
---

diff --git a/lib/ftp.c b/lib/ftp.c
index 8af653158..5aa9605d0 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -911,7 +911,7 @@ static int ftp_domore_getsock(struct connectdata *conn, curl_socket_t *socks,
     }
     else {
       socks[1] = conn->sock[SECONDARYSOCKET];
-      bits |= GETSOCK_WRITESOCK(1);
+      bits |= GETSOCK_WRITESOCK(1) | GETSOCK_READSOCK(1);
     }
 
     return bits;