From 1afa9db689ba2505c5c67c1fb1cbe2d445e2bf72 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Sun, 6 Apr 2014 05:07:10 +0000
Subject: [PATCH] merged proxy fix for adding .torrent file by URL from RC_0_16

---
 ChangeLog       |  1 +
 src/torrent.cpp | 13 ++++++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c97adc00..5f3ac6e29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* fix to use proxy settings when adding .torrent file from URL
 	* fix resume file issue related to daylight savings time on windows
 	* improve error checking in lazy_bdecode
 
diff --git a/src/torrent.cpp b/src/torrent.cpp
index 6d1b1b524..89d2b9fef 100644
--- a/src/torrent.cpp
+++ b/src/torrent.cpp
@@ -829,10 +829,17 @@ namespace libtorrent
 			new http_connection(m_ses.m_io_service, m_ses.m_half_open			        
 				, boost::bind(&torrent::on_torrent_download, shared_from_this()
 					, _1, _2, _3, _4)
-				, true //bottled
-				, m_ses.settings().max_http_recv_buffer_size //bottled buffer size
+				, true // bottled
+				, m_ses.settings().max_http_recv_buffer_size // bottled buffer size
+				, http_connect_handler()
+				, http_filter_handler()
+#ifdef TORRENT_USE_OPENSSL
+				, m_ssl_ctx.get()
+#endif
 				));
-		conn->get(m_url, seconds(30), 0, 0, 5, m_ses.m_settings.user_agent);
+
+		conn->get(m_url, seconds(30), 0, &m_ses.proxy()
+			, 5, m_ses.m_settings.user_agent);
 		set_state(torrent_status::downloading_metadata);
 	}