(trunk libT) reinstate proxies in the http announce

This commit is contained in:
Charles Kerr 2010-01-10 20:15:56 +00:00
parent 2ac553361a
commit e2feb075b9
1 changed files with 0 additions and 5 deletions

View File

@ -132,7 +132,6 @@ sockoptfunction( void * vtask, curl_socket_t fd, curlsocktype purpose UNUSED )
return 0; return 0;
} }
#if 0
static int static int
getCurlProxyType( tr_proxy_type t ) getCurlProxyType( tr_proxy_type t )
{ {
@ -140,7 +139,6 @@ getCurlProxyType( tr_proxy_type t )
if( t == TR_PROXY_SOCKS5 ) return CURLPROXY_SOCKS5; if( t == TR_PROXY_SOCKS5 ) return CURLPROXY_SOCKS5;
return CURLPROXY_HTTP; return CURLPROXY_HTTP;
} }
#endif
static int static int
getTimeoutFromURL( const char * url ) getTimeoutFromURL( const char * url )
@ -168,8 +166,6 @@ addTask( void * vtask )
dbgmsg( "adding task #%lu [%s]", task->tag, task->url ); dbgmsg( "adding task #%lu [%s]", task->tag, task->url );
/* experimentally disable proxies to see if that has any effect on the libevent crashes */
#if 0
if( !task->range && session->isProxyEnabled ) { if( !task->range && session->isProxyEnabled ) {
curl_easy_setopt( e, CURLOPT_PROXY, session->proxy ); curl_easy_setopt( e, CURLOPT_PROXY, session->proxy );
curl_easy_setopt( e, CURLOPT_PROXYAUTH, CURLAUTH_ANY ); curl_easy_setopt( e, CURLOPT_PROXYAUTH, CURLAUTH_ANY );
@ -183,7 +179,6 @@ addTask( void * vtask )
curl_easy_setopt( e, CURLOPT_PROXYUSERPWD, str ); curl_easy_setopt( e, CURLOPT_PROXYUSERPWD, str );
tr_free( str ); tr_free( str );
} }
#endif
task->easy = e; task->easy = e;
task->multi = web->multi; task->multi = web->multi;