Changeset 7557

Timestamp:

Dec 31, 2008, 2:28:20 PM (12 years ago)

Author:

charles

Message:

(trunk libT) this diff has held #1631 at bay for 18 hours now... is it finally fixed? :)

File:

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

trunk/libtransmission/web.c

@@ -129 +129 @@
         curl_easy_setopt( easy, CURLOPT_CONNECTTIMEOUT, 120L );
         curl_easy_setopt( easy, CURLOPT_FOLLOWLOCATION, 1L );
-        curl_easy_setopt( easy, CURLOPT_FORBID_REUSE, 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, 0L );
         curl_easy_setopt( easy, CURLOPT_SSL_VERIFYPEER, 0L );
-        curl_easy_setopt( easy, CURLOPT_TIMEOUT, 240L );
         curl_easy_setopt( easy, CURLOPT_URL, task->url );
         curl_easy_setopt( easy, CURLOPT_USERAGENT,
@@ -282 +279 @@
    after calling this function */
 static void
-tr_multi_socket_action( tr_web * g, int fd, int mask )
+tr_multi_socket_action( tr_web * g, int fd )
 {
     int closed = FALSE;
@@ -292 +289 @@
     /* invoke libcurl's processing */
     do {
-        rc = curl_multi_socket_action( g->multi, fd, mask, &g->still_running );
-        dbgmsg( "event_cb(): fd %d, mask %d, still_running is %d",
-                fd, mask, g->still_running );
+        rc = curl_multi_socket_action( g->multi, fd, 0, &g->still_running );
+        dbgmsg( "event_cb(): fd %d, still_running is %d",
+                fd, g->still_running );
     } while( rc == CURLM_CALL_MULTI_PERFORM );
     if( rc != CURLM_OK )
@@ -319 +316 @@
 /* libevent says that sock is ready to be processed, so wake up libcurl */
 static void
-event_cb( int fd, short kind, void * g )
-{
-    int error;
-    int mask;
-    socklen_t errsz;
-
-    error = 0;
-    errsz = sizeof( error );
-    getsockopt( fd, SOL_SOCKET, SO_ERROR, &error, &errsz );
-    if( error )
-        mask = CURL_CSELECT_ERR;
-    else {
-        mask = 0;
-        if( kind & EV_READ  ) mask |= CURL_CSELECT_IN;
-        if( kind & EV_WRITE ) mask |= CURL_CSELECT_OUT;
-    }
-
-    tr_multi_socket_action( g, fd, mask );
+event_cb( int fd, short kind UNUSED, void * g )
+{
+    tr_multi_socket_action( g, fd );
 }
 
@@ -344 +326 @@
 {
     dbgmsg( "libevent timer is done" );
-    tr_multi_socket_action( g, CURL_SOCKET_TIMEOUT, 0 );
+    tr_multi_socket_action( g, CURL_SOCKET_TIMEOUT );
 }