curl_easy_getopt(CURLINFO_RESPONSE_CODE) needs a pointer to a long, not an int.

diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c
index 91e427055cf266e9122ccbc87814f9c7505a521f..a97f7bf5310ca93fc6aaa35d567727849075ca8a 100644 (file)
--- a/libtransmission/tracker.c
+++ b/libtransmission/tracker.c
@@ -62,7 +62,7 @@ enum
     STOP_TIMEOUT_INTERVAL_SEC = 5,
 
     /* the value of the 'numwant' argument passed in tracker requests. */
-    NUMWANT = 150,
+    NUMWANT = 80,
 
     /* the length of the 'key' argument passed in tracker requests */
     KEYLEN = 10

diff --git a/libtransmission/web.c b/libtransmission/web.c
index 2261b09fed9cc8d2d1b81d33d56642e0801d5e88..598b229f76a59435465470bc9975f03861ea069b 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -74,7 +74,7 @@ processCompletedTasks( tr_web * web )
         }
         if( easy ) {
             struct tr_web_task * task;
-            int response_code;
+            long response_code;
             curl_easy_getinfo( easy, CURLINFO_PRIVATE, &task );
             curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &response_code );
             --web->remain;
@@ -84,7 +84,6 @@ processCompletedTasks( tr_web * web )
                              EVBUFFER_DATA(task->response),
                              EVBUFFER_LENGTH(task->response),
                              task->done_func_user_data );
-
             curl_multi_remove_handle( web->cm, easy );
             curl_easy_cleanup( easy );
             evbuffer_free( task->response );
@@ -127,8 +126,8 @@ addTask( void * vtask )
     struct tr_web * web = task->session->web;
     CURL * ch;
 
-    dbgmsg( "adding task #%lu [%s]", task->tag, task->url );
     ++web->remain;
+    dbgmsg( "adding task #%lu [%s] (%d remain)", task->tag, task->url, web->remain );
 
     ch = curl_easy_init( );
     curl_easy_setopt( ch, CURLOPT_PRIVATE, task );
@@ -209,6 +208,7 @@ multi_sock_cb( CURL            * easy UNUSED,
 
     if( action == CURL_POLL_REMOVE ) {
         if( ev ) {
+            dbgmsg( "deleting libevent socket polling" );
             event_del( ev );
             tr_free( ev );
             curl_multi_assign( web->cm, sock, NULL );
@@ -305,9 +305,6 @@ tr_webInit( tr_session * session )
 #endif
 #if CURL_CHECK_VERSION(7,16,3)
     curl_multi_setopt( web->cm, CURLMOPT_MAXCONNECTS, 10 );
-#endif
-#if CURL_CHECK_VERSION(7,16,0)
-    curl_multi_setopt( web->cm, CURLMOPT_PIPELINING, 1 );
 #endif
     pump( web );
 
@@ -317,6 +314,7 @@ tr_webInit( tr_session * session )
 void
 tr_webClose( tr_web * web )
 {
+    dbgmsg( "deleting web->timer" );
     evtimer_del( &web->timer );
     curl_multi_cleanup( web->cm );
     tr_free( web );