aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/connect.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/connect.c b/lib/connect.c
index a560c4d3b..af225ab83 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -1111,10 +1111,13 @@ int Curl_closesocket(struct connectdata *conn,
curl_socket_t sock)
{
if(conn && conn->fclosesocket) {
- if((sock != conn->sock[SECONDARYSOCKET]) ||
- !conn->sock_accepted[SECONDARYSOCKET])
+ if((sock == conn->sock[SECONDARYSOCKET]) &&
+ conn->sock_accepted[SECONDARYSOCKET])
/* if this socket matches the second socket, and that was created with
- accept, then we MUST NOT call the callback */
+ accept, then we MUST NOT call the callback but clear the accepted
+ status */
+ conn->sock_accepted[SECONDARYSOCKET] = FALSE;
+ else
return conn->fclosesocket(conn->closesocket_client, sock);
}
return sclose(sock);