summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2016-08-29 14:49:03 -0300
committerGustavo Sverzut Barbieri <barbieri@profusion.mobi>2016-08-30 00:35:35 -0300
commitfba2743361d5a149f9d9ccc7642dc209da523c01 (patch)
treecec9a0f8214ba7eb14d6d4a6cd18c367c33130a5
parent68ea5bd025a6582c96860ee875f4510d1f0d0c23 (diff)
downloadefl-fba2743361d5a149f9d9ccc7642dc209da523c01.tar.gz
efl_net_dialer_http: cancel curl multi timer when it's gone.
If we delete the curl multi handle, then we should stop any timer that was scheduled, otherwise it will use a dead or null pointer. also add some debug to help track down when the multi handle is deleted.
-rw-r--r--src/lib/ecore_con/efl_net_dialer_http.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/ecore_con/efl_net_dialer_http.c b/src/lib/ecore_con/efl_net_dialer_http.c
index d3a4b55e8e..f80bd4e31e 100644
--- a/src/lib/ecore_con/efl_net_dialer_http.c
+++ b/src/lib/ecore_con/efl_net_dialer_http.c
@@ -522,6 +522,9 @@ static void
_efl_net_dialer_http_curlm_remove(Efl_Net_Dialer_Http_Curlm *cm, Eo *o, CURL *handle)
{
CURLMcode r = curl_multi_remove_handle(cm->multi, handle);
+
+ DBG("removed handle cm=%p multi=%p easy=%p: %s",
+ cm, cm->multi, handle, curl_multi_strerror(r));
if (r != CURLM_OK)
{
ERR("could not unregister curl multi handle %p: %s",
@@ -531,8 +534,15 @@ _efl_net_dialer_http_curlm_remove(Efl_Net_Dialer_Http_Curlm *cm, Eo *o, CURL *ha
cm->users = eina_list_remove(cm->users, o);
if (!cm->users)
{
+ DBG("cleaned up cm=%p multi=%p", cm, cm->multi);
curl_multi_cleanup(cm->multi);
cm->multi = NULL;
+
+ if (cm->timer)
+ {
+ efl_del(cm->timer);
+ cm->timer = NULL;
+ }
}
}