Changeset 6983

Timestamp:

Oct 29, 2008, 4:06:14 PM (12 years ago)

Author:

charles

Message:

(libT) #1359: Transmission shows no tracker error when unable to contact the tracker

File:

• trunk/libtransmission/web.c (modified) (2 diffs)

trunk/libtransmission/web.c

@@ -120 +120 @@
         }
 
-        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 60 );
-        curl_easy_setopt( easy, CURLOPT_FOLLOWLOCATION, 1 );
-        curl_easy_setopt( easy, CURLOPT_MAXREDIRS, 16 );
-        curl_easy_setopt( easy, CURLOPT_NOSIGNAL, 1 );
+        curl_easy_setopt( easy, CURLOPT_DNS_CACHE_TIMEOUT, 360L );
+        curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 60L );
+        curl_easy_setopt( easy, CURLOPT_FOLLOWLOCATION, 1L );
+        curl_easy_setopt( easy, CURLOPT_MAXREDIRS, 16L );
+        curl_easy_setopt( easy, CURLOPT_NOSIGNAL, 1L );
         curl_easy_setopt( easy, CURLOPT_PRIVATE, task );
-        curl_easy_setopt( easy, CURLOPT_SSL_VERIFYHOST, 0 );
-        curl_easy_setopt( easy, CURLOPT_SSL_VERIFYPEER, 0 );
+        curl_easy_setopt( easy, CURLOPT_SSL_VERIFYHOST, 0L );
+        curl_easy_setopt( easy, CURLOPT_SSL_VERIFYPEER, 0L );
         curl_easy_setopt( easy, CURLOPT_URL, task->url );
         curl_easy_setopt( easy, CURLOPT_USERAGENT,
@@ -188 +189 @@
 remove_finished_tasks( tr_web * g )
 {
-
-    if( g->prev_running != g->still_running )
+    CURL * easy;
+
+    do
     {
-        CURL * easy;
-
-        do
-        {
-            CURLMsg * msg;
-            int msgs_left;
-            CURLcode res;
-
-            easy = NULL;
-            while(( msg = curl_multi_info_read( g->multi, &msgs_left ))) {
-                if( msg->msg == CURLMSG_DONE ) {
-                    easy = msg->easy_handle;
-                    res = msg->data.result;
-                    break;
-                }
+        CURLMsg * msg;
+        int msgs_left;
+        CURLcode res;
+
+        easy = NULL;
+        while(( msg = curl_multi_info_read( g->multi, &msgs_left ))) {
+            if( msg->msg == CURLMSG_DONE ) {
+                easy = msg->easy_handle;
+                res = msg->data.result;
+                break;
             }
-
-            if( easy ) {
-                long code;
-                struct tr_web_task * task;
-                curl_easy_getinfo( easy, CURLINFO_PRIVATE, (void*)&task );
-                curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &code );
-                curl_multi_remove_handle( g->multi, easy );
-                curl_easy_cleanup( easy );
-                task_finish( task, code );
-            }
-        }
-        while ( easy );
-
-        g->prev_running = g->still_running;
-    }
+        }
+
+        if( easy ) {
+            long code;
+            struct tr_web_task * task;
+            curl_easy_getinfo( easy, CURLINFO_PRIVATE, (void*)&task );
+            curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &code );
+            curl_multi_remove_handle( g->multi, easy );
+            curl_easy_cleanup( easy );
+            task_finish( task, code );
+        }
+    }
+    while ( easy );
+
+    g->prev_running = g->still_running;
 }