minor streaming improvements

src/peer_connection.cpp

@@ -995,8 +995,7 @@ namespace libtorrent
 		else
 		{
 			// current download rate in bytes per seconds
-			rate = m_statistics.transfer_rate(stat::download_payload)
-				+ m_statistics.transfer_rate(stat::download_protocol);
+			rate = m_statistics.transfer_rate(stat::download_payload);
 		}
 
 		// avoid division by zero

src/torrent.cpp

@@ -8793,6 +8793,11 @@ namespace libtorrent
 					, boost::bind(&peer_connection::download_queue_time, _1, 16*1024)
 					< boost::bind(&peer_connection::download_queue_time, _2, 16*1024));
 			}
+
+			// if this peer's download time exceeds 2 seconds, we're done.
+			// We don't want to build unreasonably long request queues
+			if (!peers.empty() && peers[0]->download_queue_time() > milliseconds(2000))
+				break;
 		}
 
 		// commit all the time critical requests