From 7f9e86a6277e4578f7eb09b3b40e2b9ba56bfac2 Mon Sep 17 00:00:00 2001
From: BenDroid <ben@graef.in>
Date: Fri, 9 Feb 2018 20:15:11 +0100
Subject: [PATCH] Fixed behavior for non-tls mode

---
 src/cc/CCClient.cpp |  8 ++++----
 src/cc/Httpd.cpp    | 11 ++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/cc/CCClient.cpp b/src/cc/CCClient.cpp
index 83bab7a7..e0639525 100644
--- a/src/cc/CCClient.cpp
+++ b/src/cc/CCClient.cpp
@@ -265,13 +265,13 @@ std::shared_ptr<httplib::Response> CCClient::performRequest(const std::string& r
 #   ifndef XMRIG_NO_SSL_TLS
     if (m_self->m_options->ccUseTls()) {
         cli = std::make_shared<httplib::SSLClient>(m_self->m_options->ccHost(), m_self->m_options->ccPort());
+    } else {
+#   endif
+        cli = std::make_shared<httplib::Client>(m_self->m_options->ccHost(), m_self->m_options->ccPort());
+#   ifndef XMRIG_NO_SSL_TLS
     }
 #   endif
 
-    if (!cli) {
-        cli = std::make_shared<httplib::Client>(m_self->m_options->ccHost(), m_self->m_options->ccPort());
-    }
-
     httplib::Request req;
     req.method = operation;
     req.path = requestUrl;
diff --git a/src/cc/Httpd.cpp b/src/cc/Httpd.cpp
index e7527e23..ce996fad 100644
--- a/src/cc/Httpd.cpp
+++ b/src/cc/Httpd.cpp
@@ -62,14 +62,15 @@ bool Httpd::start()
                                    MHD_OPTION_HTTPS_MEM_KEY, m_keyPem.c_str(),
                                    MHD_OPTION_HTTPS_MEM_CERT, m_certPem.c_str(),
                                    MHD_OPTION_END);
+    } else {
+#   endif
+        m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, static_cast<uint16_t>(m_options->ccPort()), nullptr,
+                                    nullptr, &Httpd::handler,
+                                    this, MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 10, MHD_OPTION_END);
+#   ifndef XMRIG_NO_SSL_TLS
     }
 #   endif
 
-    if (!m_daemon) {
-        m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY, static_cast<uint16_t>(m_options->ccPort()), nullptr, nullptr, &Httpd::handler,
-                                    this, MHD_OPTION_CONNECTION_TIMEOUT, (unsigned int) 10,  MHD_OPTION_END);
-    }
-
     if (!m_daemon) {
         LOG_ERR("HTTP Daemon failed to start.");
         return false;