curl_easy_getopt(CURLINFO_RESPONSE_CODE) needs a pointer to a long, not an int.
This commit is contained in:
parent
3b27e2d2af
commit
b66af4ab07
|
@ -62,7 +62,7 @@ enum
|
||||||
STOP_TIMEOUT_INTERVAL_SEC = 5,
|
STOP_TIMEOUT_INTERVAL_SEC = 5,
|
||||||
|
|
||||||
/* the value of the 'numwant' argument passed in tracker requests. */
|
/* the value of the 'numwant' argument passed in tracker requests. */
|
||||||
NUMWANT = 150,
|
NUMWANT = 80,
|
||||||
|
|
||||||
/* the length of the 'key' argument passed in tracker requests */
|
/* the length of the 'key' argument passed in tracker requests */
|
||||||
KEYLEN = 10
|
KEYLEN = 10
|
||||||
|
|
|
@ -74,7 +74,7 @@ processCompletedTasks( tr_web * web )
|
||||||
}
|
}
|
||||||
if( easy ) {
|
if( easy ) {
|
||||||
struct tr_web_task * task;
|
struct tr_web_task * task;
|
||||||
int response_code;
|
long response_code;
|
||||||
curl_easy_getinfo( easy, CURLINFO_PRIVATE, &task );
|
curl_easy_getinfo( easy, CURLINFO_PRIVATE, &task );
|
||||||
curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &response_code );
|
curl_easy_getinfo( easy, CURLINFO_RESPONSE_CODE, &response_code );
|
||||||
--web->remain;
|
--web->remain;
|
||||||
|
@ -84,7 +84,6 @@ processCompletedTasks( tr_web * web )
|
||||||
EVBUFFER_DATA(task->response),
|
EVBUFFER_DATA(task->response),
|
||||||
EVBUFFER_LENGTH(task->response),
|
EVBUFFER_LENGTH(task->response),
|
||||||
task->done_func_user_data );
|
task->done_func_user_data );
|
||||||
|
|
||||||
curl_multi_remove_handle( web->cm, easy );
|
curl_multi_remove_handle( web->cm, easy );
|
||||||
curl_easy_cleanup( easy );
|
curl_easy_cleanup( easy );
|
||||||
evbuffer_free( task->response );
|
evbuffer_free( task->response );
|
||||||
|
@ -127,8 +126,8 @@ addTask( void * vtask )
|
||||||
struct tr_web * web = task->session->web;
|
struct tr_web * web = task->session->web;
|
||||||
CURL * ch;
|
CURL * ch;
|
||||||
|
|
||||||
dbgmsg( "adding task #%lu [%s]", task->tag, task->url );
|
|
||||||
++web->remain;
|
++web->remain;
|
||||||
|
dbgmsg( "adding task #%lu [%s] (%d remain)", task->tag, task->url, web->remain );
|
||||||
|
|
||||||
ch = curl_easy_init( );
|
ch = curl_easy_init( );
|
||||||
curl_easy_setopt( ch, CURLOPT_PRIVATE, task );
|
curl_easy_setopt( ch, CURLOPT_PRIVATE, task );
|
||||||
|
@ -209,6 +208,7 @@ multi_sock_cb( CURL * easy UNUSED,
|
||||||
|
|
||||||
if( action == CURL_POLL_REMOVE ) {
|
if( action == CURL_POLL_REMOVE ) {
|
||||||
if( ev ) {
|
if( ev ) {
|
||||||
|
dbgmsg( "deleting libevent socket polling" );
|
||||||
event_del( ev );
|
event_del( ev );
|
||||||
tr_free( ev );
|
tr_free( ev );
|
||||||
curl_multi_assign( web->cm, sock, NULL );
|
curl_multi_assign( web->cm, sock, NULL );
|
||||||
|
@ -305,9 +305,6 @@ tr_webInit( tr_session * session )
|
||||||
#endif
|
#endif
|
||||||
#if CURL_CHECK_VERSION(7,16,3)
|
#if CURL_CHECK_VERSION(7,16,3)
|
||||||
curl_multi_setopt( web->cm, CURLMOPT_MAXCONNECTS, 10 );
|
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
|
#endif
|
||||||
pump( web );
|
pump( web );
|
||||||
|
|
||||||
|
@ -317,6 +314,7 @@ tr_webInit( tr_session * session )
|
||||||
void
|
void
|
||||||
tr_webClose( tr_web * web )
|
tr_webClose( tr_web * web )
|
||||||
{
|
{
|
||||||
|
dbgmsg( "deleting web->timer" );
|
||||||
evtimer_del( &web->timer );
|
evtimer_del( &web->timer );
|
||||||
curl_multi_cleanup( web->cm );
|
curl_multi_cleanup( web->cm );
|
||||||
tr_free( web );
|
tr_free( web );
|
||||||
|
|
Loading…
Reference in New Issue