From d50ab3385541007d30880e9afdd0da96b23d38d4 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 27 Dec 2006 15:14:17 +0000
Subject: [PATCH] added clients to identify_client and a minor fix

---
 src/identify_client.cpp | 3 +++
 src/peer_connection.cpp | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/identify_client.cpp b/src/identify_client.cpp
index aa094123a..e49ff66b5 100755
--- a/src/identify_client.cpp
+++ b/src/identify_client.cpp
@@ -145,12 +145,14 @@ namespace
 		, map_entry("AZ", "Azureus")
 		, map_entry("BB", "BitBuddy")
 		, map_entry("BC", "BitComet")
+		, map_entry("BF", "Bitflu")
 		, map_entry("BS", "BTSlave")
 		, map_entry("BX", "BittorrentX")
 		, map_entry("CD", "Enhanced CTorrent")
 		, map_entry("CT", "CTorrent")
 		, map_entry("DE", "Deluge")
 		, map_entry("ES", "electric sheep")
+		, map_entry("HL", "Halite")
 		, map_entry("KT", "KTorrent")
 		, map_entry("LP", "lphant")
 		, map_entry("LT", "libtorrent")
@@ -159,6 +161,7 @@ namespace
 		, map_entry("MP", "MooPolice")
 		, map_entry("MT", "Moonlight Torrent")
 		, map_entry("O",  "Osprey Permaseed")
+		, map_entry("QT", "Qt 4")
 		, map_entry("R",  "Tribler")
 		, map_entry("S",  "Shadow")
 		, map_entry("SB", "Swiftbit")
diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index b85115bb3..881534d29 100755
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -1382,10 +1382,12 @@ namespace libtorrent
 	void peer_connection::send_block_requests()
 	{
 		INVARIANT_CHECK;
+		
+		if (has_peer_choked()) return;
 
 		boost::shared_ptr<torrent> t = m_torrent.lock();
 		assert(t);
-		
+
 		assert(!has_peer_choked());
 
 		if ((int)m_download_queue.size() >= m_desired_queue_size) return;