Commit 9063a7f8 authored by Frank Meier's avatar Frank Meier Committed by Daniel Stenberg
Browse files

closesocket: call multi socket cb on close even with custom close 

In function Curl_closesocket() in connect.c the call to
Curl_multi_closed() was wrongly omitted if a socket close function
(CURLOPT_CLOSESOCKETFUNCTION) is registered.

That would lead to not removing the socket from the internal hash table
and not calling the multi socket callback appropriately.

Bug: http://curl.haxx.se/bug/view.cgi?id=1493
parent 851c2926

lib/connect.c

+3 −1
Original line number Diff line number Diff line
@@ -1263,9 +1263,11 @@ int Curl_closesocket(struct connectdata *conn, 
         accept, then we MUST NOT call the callback but clear the accepted

         status */

      conn->sock_accepted[SECONDARYSOCKET] = FALSE;

    else

    else {

      Curl_multi_closed(conn, sock);

      return conn->fclosesocket(conn->closesocket_client, sock);

    }

  }



  if(conn)

    /* tell the multi-socket code about this */