ecore: backport r77524.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ecore-1.7@77525 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index b21f8b9..e0ca69f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -958,4 +958,9 @@
        * Fix memory allocation size in ecore_thread_feedback()
 
 2012-10-03  Daniel Wilmann
-       * Fix memory allocation size in ecore_x xcb randr function
+
+       * Fix memory allocation size in ecore_x xcb randr function
+
+2012-10-05  Cedric Bail
+
+       * Properly reschedule call to curl.

diff --git a/NEWS b/NEWS
index 8397a8c..22f0b37 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes since Ecore 1.7.0:
 --------------------------
 
 Fixes:
+    * ecore_con_url: properly reschedule call to curl.
     * ecore_evas rotation handling on some driver implementations
     * ecore_file_escape_name() escape taba nd newline right.
     * ecore_x_image_is_argb32_get() returns correctly given endianness.

diff --git a/src/lib/ecore_con/ecore_con_url.c b/src/lib/ecore_con/ecore_con_url.c
index 05f0678..20675c3 100644 (file)
--- a/src/lib/ecore_con/ecore_con_url.c
+++ b/src/lib/ecore_con/ecore_con_url.c
@@ -1518,8 +1518,15 @@ static Eina_Bool
 _ecore_con_url_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
 {
    Ecore_Fd_Handler *fdh;
+   long ms;
+
    EINA_LIST_FREE(_fd_hd_list, fdh) ecore_main_fd_handler_del(fdh);
-   ecore_timer_interval_set(_curl_timer, 0.1);
+
+   curl_multi_timeout(_curlm, &ms);
+   if (ms >= CURL_MIN_TIMEOUT || ms <= 0) ms = CURL_MIN_TIMEOUT;
+
+   ecore_timer_interval_set(_curl_timer, (double)ms / 1000);
+
    return ECORE_CALLBACK_CANCEL;
 }