(trunk) revert that last commit, which was only intended for about a dozen people...

diff --git a/configure.ac b/configure.ac
index c57e42f5525fb8639c1f68b7bf4296c5d37340d6..871a22ded2e3d9f61a5041e843daba15022538fe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,8 @@ dnl STATUS: "X" for prerelease beta builds,
 dnl         "Z" for unsupported trunk builds,
 dnl         "0" for stable, supported releases
 dnl these should be the only two lines you need to change
-m4_define([user_agent_prefix],[1.84z])
-m4_define([peer_id_prefix],[-TR184z-])
+m4_define([user_agent_prefix],[1.83])
+m4_define([peer_id_prefix],[-TR1830-])
 
 AC_INIT([transmission],
         [user_agent_prefix],

diff --git a/libtransmission/web.c b/libtransmission/web.c
index 0627f9a5fd6067a28ac805a2c8e9b42c53a06de4..841966a8d122a6719c0608e90f2eac2c83518c83 100644 (file)
--- a/libtransmission/web.c
+++ b/libtransmission/web.c
@@ -317,19 +317,13 @@ addTask( void * vtask )
     }
     else
     {
-static FILE * fp = NULL;
         CURL * e = curl_easy_init( );
         struct tr_web * web = session->web;
         const int timeout = getTimeoutFromURL( task->url );
-        //const long verbose = getenv( "TR_CURL_VERBOSE" ) != NULL;
+        const long verbose = getenv( "TR_CURL_VERBOSE" ) != NULL;
         const char * user_agent = TR_NAME "/" SHORT_VERSION_STRING;
         char * url = NULL;
 
-if( fp == NULL ) {
-    fp = fopen( "/tmp/transmission-announce-log.txt", "a+" );
-    fprintf( fp, "Starting new Transmission session...\n" );
-}
-
         /* insert the resolved host into the URL s.t. curl's DNS won't block
          * even if -- like on most OSes -- it wasn't built with C-Ares :(
          * "http://www.craptrackular.org/announce?key=val&key2=..." becomes
@@ -397,9 +391,7 @@ if( fp == NULL ) {
         curl_easy_setopt( e, CURLOPT_SSL_VERIFYPEER, 0L );
         curl_easy_setopt( e, CURLOPT_URL, url ? url : task->url );
         curl_easy_setopt( e, CURLOPT_USERAGENT, user_agent );
-        //curl_easy_setopt( e, CURLOPT_VERBOSE, verbose );
-curl_easy_setopt( e, CURLOPT_VERBOSE, TRUE );
-curl_easy_setopt( e, CURLOPT_STDERR, fp );
+        curl_easy_setopt( e, CURLOPT_VERBOSE, verbose );
         if( web->haveAddr )
             curl_easy_setopt( e, CURLOPT_INTERFACE, tr_ntop_non_ts( &web->addr ) );
         if( task->range )