fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed behavior for non-tls mode

Browse source
This commit is contained in:
BenDroid 2018-02-09 20:15:11 +01:00
parent fe108a524e
commit f97a7fb121
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/cc/CCClient.cpp
View file

@ -265,13 +265,13 @@ std::shared_ptr<httplib::Response> CCClient::performRequest(const std::string& r
# ifndef XMRIG_NO_SSL_TLS # ifndef XMRIG_NO_SSL_TLS
if (m_self->m_options->ccUseTls()) { if (m_self->m_options->ccUseTls()) {
cli = std::make_shared<httplib::SSLClient>(m_self->m_options->ccHost(), m_self->m_options->ccPort()); 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 # endif
if (!cli) {
cli = std::make_shared<httplib::Client>(m_self->m_options->ccHost(), m_self->m_options->ccPort());
}
httplib::Request req; httplib::Request req;
req.method = operation; req.method = operation;
req.path = requestUrl; req.path = requestUrl;

11
src/cc/Httpd.cpp
View file

@ -62,14 +62,15 @@ bool Httpd::start()
MHD_OPTION_HTTPS_MEM_KEY, m_keyPem.c_str(), MHD_OPTION_HTTPS_MEM_KEY, m_keyPem.c_str(),
MHD_OPTION_HTTPS_MEM_CERT, m_certPem.c_str(), MHD_OPTION_HTTPS_MEM_CERT, m_certPem.c_str(),
MHD_OPTION_END); 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 # 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) { if (!m_daemon) {
LOG_ERR("HTTP Daemon failed to start."); LOG_ERR("HTTP Daemon failed to start.");
return false; return false;