From 5965d4554da93cba5a866f9961c9b8f7bf163215 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 6 Dec 2010 15:33:38 +0100
Subject: [PATCH] disconnect: pass on the dead_connection argument
Cleanup fix after Kamil's commit 5c7c9a768d0093
---
lib/curl_rtmp.c | 6 ++++--
lib/url.c | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c
index df30dc1f6b..bc1769e67d 100644
--- a/lib/curl_rtmp.c
+++ b/lib/curl_rtmp.c
@@ -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);
diff --git a/lib/url.c b/lib/url.c
index 93a56002da..7ba262ae21 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -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
--
GitLab