From: Björn Stenberg <bjst@bjorn>
Date: Mon, 11 Nov 2013 22:43:48 +0000 (+0100)
Subject: multi: Set read socket when returning READSOCK(0)
X-Git-Tag: curl-7_34_0~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa1253aee1847bd24cbc1d23e5579d823fc16d2a;p=thirdparty%2Fcurl.git

multi: Set read socket when returning READSOCK(0)

This patch fixes and issue introduced in commit 7d7df831981fee, if the
tunnel state was TUNNEL_CONNECT, waitconnect_getsock() would return a
bitmask indicating a readable socket but never stored the socket in the
return array.
---

diff --git a/lib/multi.c b/lib/multi.c
index 722cd8625b..2cb46ceeca 100644
--- a/lib/multi.c
+++ b/lib/multi.c
@@ -637,8 +637,10 @@ static int waitconnect_getsock(struct connectdata *conn,
 
   /* when we've sent a CONNECT to a proxy, we should rather wait for the
      socket to become readable to be able to get the response headers */
-  if(conn->tunnel_state[FIRSTSOCKET] == TUNNEL_CONNECT)
+  if(conn->tunnel_state[FIRSTSOCKET] == TUNNEL_CONNECT) {
+    sock[0] = conn->sock[FIRSTSOCKET];
     return GETSOCK_READSOCK(0);
+  }
 
   return rc;
 }