generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disconnect: pass on the dead_connection argument

Browse Source 
Cleanup fix after Kamil's commit 5c7c9a768d0093
This commit is contained in:
Daniel Stenberg 2010-12-06 15:33:38 +01:00
parent 34127c7adc
commit 5965d4554d
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/curl_rtmp.c
View File

@ -51,7 +51,7 @@ static CURLcode rtmp_setup(struct connectdata *conn);
static CURLcode rtmp_do(struct connectdata *conn, bool *done); static CURLcode rtmp_do(struct connectdata *conn, bool *done);
static CURLcode rtmp_done(struct connectdata *conn, CURLcode, bool premature); static CURLcode rtmp_done(struct connectdata *conn, CURLcode, bool premature);
static CURLcode rtmp_connect(struct connectdata *conn, bool *done); 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_recv rtmp_recv;
static Curl_send rtmp_send; static Curl_send rtmp_send;
@ -236,9 +236,11 @@ static CURLcode rtmp_done(struct connectdata *conn, CURLcode status,
return CURLE_OK; 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; RTMP *r = conn->proto.generic;
(void)dead_connection;
if (r) { if (r) {
conn->proto.generic = NULL; conn->proto.generic = NULL;
RTMP_Close(r); RTMP_Close(r);

2
lib/url.c
View File

@ -5145,7 +5145,7 @@ CURLcode Curl_async_resolved(struct connectdata *conn,
if(code) if(code)
/* We're not allowed to return failure with memory left allocated /* We're not allowed to return failure with memory left allocated
in the connectdata struct, free those here */ in the connectdata struct, free those here */
Curl_disconnect(conn); /* close the connection */ Curl_disconnect(conn, FALSE); /* close the connection */
return code; return code;
#else #else