From 3228daa54e93fe68aeb0e08a428795fa6dcc0d28 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Sun, 2 Jun 2013 14:10:43 +0200 Subject: [PATCH] CURL: the cleanup has to be done before. --- citadel/event_client.c | 3 +++ citadel/modules/eventclient/serv_eventclient.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/citadel/event_client.c b/citadel/event_client.c index c9c149f8e..78876b502 100644 --- a/citadel/event_client.c +++ b/citadel/event_client.c @@ -403,6 +403,9 @@ void StopCurlWatchers(AsyncIO *IO) ev_io_stop(event_base, &IO->send_event); ev_io_stop(event_base, &IO->recv_event); + curl_easy_cleanup(IO->HttpReq.chnd); + IO->HttpReq.chnd = NULL; + if (IO->SendBuf.fd != 0) { close(IO->SendBuf.fd); } diff --git a/citadel/modules/eventclient/serv_eventclient.c b/citadel/modules/eventclient/serv_eventclient.c index e08a39f28..75e1f785a 100644 --- a/citadel/modules/eventclient/serv_eventclient.c +++ b/citadel/modules/eventclient/serv_eventclient.c @@ -193,9 +193,6 @@ gotstatus(int nnrun) switch(IO->SendDone(IO)) { case eDBQuery: - curl_easy_cleanup(IO->HttpReq.chnd); - IO->HttpReq.chnd = NULL; - break; case eSendDNSQuery: case eReadDNSReply: case eConnect: @@ -206,8 +203,6 @@ gotstatus(int nnrun) case eReadMore: case eReadPayload: case eReadFile: - curl_easy_cleanup(IO->HttpReq.chnd); - IO->HttpReq.chnd = NULL; break; case eTerminateConnection: case eAbort: -- 2.30.2