From 4141b76574d4d83e258efb5794d7ac4623a23085 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Thu, 24 Nov 2016 18:05:19 +0100
Subject: [PATCH] Cleanup of Client::connect methods

---
 client_http.hpp  | 15 +++++----------
 client_https.hpp | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/client_http.hpp b/client_http.hpp
index f2abbe3..efaba65 100644
--- a/client_http.hpp
+++ b/client_http.hpp
@@ -372,19 +372,14 @@ namespace SimpleWeb {
         
         void connect() {
             if(!socket || !socket->is_open()) {
-                std::string host, port;
-                if(config.proxy_server.empty()) {
-                    host=this->host;
-                    port=std::to_string(this->port);
-                }
+                std::unique_ptr<boost::asio::ip::tcp::resolver::query> query;
+                if(config.proxy_server.empty())
+                    query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(host, std::to_string(port)));
                 else {
                     auto proxy_host_port=parse_host_port(config.proxy_server, 0);
-                    host=proxy_host_port.first;
-                    port=std::to_string(proxy_host_port.second);
+                    query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second)));
                 }
-                boost::asio::ip::tcp::resolver::query query(host, port);
-                
-                resolver.async_resolve(query, [this](const boost::system::error_code &ec,
+                resolver.async_resolve(*query, [this](const boost::system::error_code &ec,
                                                      boost::asio::ip::tcp::resolver::iterator it){
                     if(!ec) {
                         {
diff --git a/client_https.hpp b/client_https.hpp
index a6399c3..b06581d 100644
--- a/client_https.hpp
+++ b/client_https.hpp
@@ -39,19 +39,14 @@ namespace SimpleWeb {
         
         void connect() {
             if(!socket || !socket->lowest_layer().is_open()) {
-                std::string host, port;
-                if(config.proxy_server.empty()) {
-                    host=this->host;
-                    port=std::to_string(this->port);
-                }
+                std::unique_ptr<boost::asio::ip::tcp::resolver::query> query;
+                if(config.proxy_server.empty())
+                    query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(host, std::to_string(port)));
                 else {
                     auto proxy_host_port=parse_host_port(config.proxy_server, 0);
-                    host=proxy_host_port.first;
-                    port=std::to_string(proxy_host_port.second);
+                    query=std::unique_ptr<boost::asio::ip::tcp::resolver::query>(new boost::asio::ip::tcp::resolver::query(proxy_host_port.first, std::to_string(proxy_host_port.second)));
                 }
-                boost::asio::ip::tcp::resolver::query query(host, port);
-                
-                resolver.async_resolve(query, [this]
+                resolver.async_resolve(*query, [this]
                                        (const boost::system::error_code &ec, boost::asio::ip::tcp::resolver::iterator it){
                     if(!ec) {
                         {