summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2012-10-05 10:17:18 +0000
committerCedric BAIL <cedric.bail@free.fr>2012-10-05 10:17:18 +0000
commitd308248e4c6c9bc8b994682c2eaed8b977e1991a (patch)
tree9cbd62c7545f6e7c41f83d6bd554149efebf498d /legacy
parent52e4090f9214d69588b27dd871f22498b76c3e27 (diff)
ecore: properly reschedule call to curl.
SVN revision: 77524
Diffstat (limited to 'legacy')
-rw-r--r--legacy/ecore/ChangeLog4
-rw-r--r--legacy/ecore/NEWS1
-rw-r--r--legacy/ecore/src/lib/ecore_con/ecore_con_url.c9
3 files changed, 13 insertions, 1 deletions
diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog
index c47de4f..5a75725 100644
--- a/legacy/ecore/ChangeLog
+++ b/legacy/ecore/ChangeLog
@@ -985,3 +985,7 @@
9852012-10-04 Sebastian Dransfeld 9852012-10-04 Sebastian Dransfeld
986 986
987 * Expose ecore_x_selection_converter_text 987 * Expose ecore_x_selection_converter_text
988
9892012-10-05 Cedric Bail
990
991 * Properly reschedule call to curl.
diff --git a/legacy/ecore/NEWS b/legacy/ecore/NEWS
index 9693193..708ed8f 100644
--- a/legacy/ecore/NEWS
+++ b/legacy/ecore/NEWS
@@ -20,6 +20,7 @@ Fixes:
20 * ecore_con_url: 20 * ecore_con_url:
21 - Timeouts are handled correctly now (passing HTTP status 408 to 21 - Timeouts are handled correctly now (passing HTTP status 408 to
22 completion callback). 22 completion callback).
23 - properly reschedule call to curl.
23 * ecore_evas rotation handling on some driver implementations 24 * ecore_evas rotation handling on some driver implementations
24 * ecore_file_escape_name() escape taba nd newline right. 25 * ecore_file_escape_name() escape taba nd newline right.
25 * ecore_imf ibus module potential segv fixed. 26 * ecore_imf ibus module potential segv fixed.
diff --git a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
index 1e7847c..47d11e1 100644
--- a/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
+++ b/legacy/ecore/src/lib/ecore_con/ecore_con_url.c
@@ -1540,8 +1540,15 @@ static Eina_Bool
1540_ecore_con_url_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__) 1540_ecore_con_url_fd_handler(void *data __UNUSED__, Ecore_Fd_Handler *fd_handler __UNUSED__)
1541{ 1541{
1542 Ecore_Fd_Handler *fdh; 1542 Ecore_Fd_Handler *fdh;
1543 long ms;
1544
1543 EINA_LIST_FREE(_fd_hd_list, fdh) ecore_main_fd_handler_del(fdh); 1545 EINA_LIST_FREE(_fd_hd_list, fdh) ecore_main_fd_handler_del(fdh);
1544 ecore_timer_interval_set(_curl_timer, 0.1); 1546
1547 curl_multi_timeout(_curlm, &ms);
1548 if (ms >= CURL_MIN_TIMEOUT || ms <= 0) ms = CURL_MIN_TIMEOUT;
1549
1550 ecore_timer_interval_set(_curl_timer, (double)ms / 1000);
1551
1545 return ECORE_CALLBACK_CANCEL; 1552 return ECORE_CALLBACK_CANCEL;
1546} 1553}
1547 1554