Commit 5965d455 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

disconnect: pass on the dead_connection argument 

Cleanup fix after Kamil's commit 5c7c9a76
parent 34127c7a

lib/curl_rtmp.c

+4 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static CURLcode rtmp_setup(struct connectdata *conn); 
static CURLcode rtmp_do(struct connectdata *conn, bool *done);

static CURLcode rtmp_done(struct connectdata *conn, CURLcode, bool premature);

static CURLcode rtmp_connect(struct connectdata *conn, bool *done);

static CURLcode rtmp_disconnect(struct connectdata *conn);

static CURLcode rtmp_disconnect(struct connectdata *conn, bool dead_connection);



static Curl_recv rtmp_recv;

static Curl_send rtmp_send;
@@ -236,9 +236,11 @@ static CURLcode rtmp_done(struct connectdata *conn, CURLcode status, 
  return CURLE_OK;

}



static CURLcode rtmp_disconnect(struct connectdata *conn)

static CURLcode rtmp_disconnect(struct connectdata *conn,

                                bool dead_connection)

{

  RTMP *r = conn->proto.generic;

  (void)dead_connection;

  if (r) {

    conn->proto.generic = NULL;

    RTMP_Close(r);

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -5145,7 +5145,7 @@ CURLcode Curl_async_resolved(struct connectdata *conn, 
  if(code)

    /* We're not allowed to return failure with memory left allocated

       in the connectdata struct, free those here */

    Curl_disconnect(conn); /* close the connection */

    Curl_disconnect(conn, FALSE); /* close the connection */



  return code;

#else