From 8713d3468cb33600ac3cf63ff10611f23b3171b6 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@transmissionbt.com>
Date: Fri, 17 Aug 2007 05:00:59 +0000
Subject: [PATCH] don't cache the connection; these are one-shot requests

---
 libtransmission/tracker.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/libtransmission/tracker.c b/libtransmission/tracker.c
index 0fd948949..32343a5f6 100644
--- a/libtransmission/tracker.c
+++ b/libtransmission/tracker.c
@@ -126,7 +126,6 @@ typedef struct tr_tracker_s
     tr_timer_tag scrapeTag;
     tr_timer_tag reannounceTag;
 
-    struct evhttp_connection * httpConn;
     struct evhttp_request * httpReq;
 
     tr_torrent_t * torrent;
@@ -862,7 +861,6 @@ onTrackerResponse( struct evhttp_request * req, void * vtor )
         publishErrorMessage( tor, buf );
     }
 
-    tor->httpConn = NULL;
     tor->httpReq = NULL;
 
     if( isStopped )
@@ -883,6 +881,7 @@ sendTrackerRequest( void * vtor, const char * eventName )
     Torrent * tor = (Torrent *) vtor;
     const tr_tracker_info_t * address = getCurrentAddress( tor->tracker );
     char * uri = buildTrackerRequestURI( tor, eventName );
+    struct evhttp_connection * evcon = NULL;
 
     tr_inf( "tracker request to %s:%d: %s", address->address,
                                             address->port, uri );
@@ -890,19 +889,16 @@ sendTrackerRequest( void * vtor, const char * eventName )
     /* kill any pending requests */
     tr_timerFree( &tor->reannounceTag );
 
-    /* make a connection if we don't have one */
-    if( tor->httpConn == NULL )
-        tor->httpConn = evhttp_connection_new( address->address,
-                                               address->port );
-    if ( tor->httpConn == NULL )
+    evcon = evhttp_connection_new( address->address, address->port );
+    if ( !evcon )
         tr_err( "Can't make a connection to %s:%d", address->address, address->port );
     else {
         tr_free( tor->lastRequest );
         tor->lastRequest = tr_strdup( eventName );
-        evhttp_connection_set_timeout( tor->httpConn, REQ_TIMEOUT_INTERVAL_SEC );
+        evhttp_connection_set_timeout( evcon, REQ_TIMEOUT_INTERVAL_SEC );
         tor->httpReq = evhttp_request_new( onTrackerResponse, tor );
         addCommonHeaders( tor->tracker, tor->httpReq );
-        evhttp_make_request( tor->httpConn, tor->httpReq, EVHTTP_REQ_GET, uri );
+        evhttp_make_request( evcon, tor->httpReq, EVHTTP_REQ_GET, uri );
     }
 
     tr_free( uri );