Skip to content

Commit 44ab3d8

Browse files
author
=
committed
Changed default values of maxinstances in WebServerHelper.cpp.
Removed some unused code in proxyclient.cpp.
1 parent f61f56b commit 44ab3d8

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

main/WebServerHelper.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ namespace http {
127127

128128
int CWebServerHelper::GetNrMyDomoticzThreads()
129129
{
130-
int nrThreads = 3; // default value
130+
int nrThreads = 1; // default value
131131
m_sql.GetPreferencesVar("MyDomoticzNrThreads", nrThreads);
132132
return nrThreads;
133133
}
134134
}
135135

136-
}
136+
}

webserver/proxyclient.cpp

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ void CProxyClient::LoginToService()
9494
parameters.AddPart((void *)_instanceid.c_str(), _instanceid.length() + 1);
9595
parameters.AddPart((void *)_password.c_str(), _password.length() + 1);
9696
parameters.AddPart((void *) szAppVersion.c_str(), szAppVersion.length() + 1);
97-
// todo: version
97+
// todo: valid subsystems
9898
MyWrite(PDU_AUTHENTICATE, &parameters);
9999
}
100100

@@ -158,14 +158,10 @@ void CProxyClient::GetRequest(const std::string originatingip, boost::asio::muta
158158
if (result)
159159
{
160160
m_pWebEm->myRequestHandler.handle_request(originatingip, request_, reply_);
161-
//std::vector<boost::asio::const_buffer> replybuf = reply_.to_buffers();
162-
//response = std::string(boost::asio::buffers_begin(replybuf), boost::asio::buffers_begin(replybuf) + boost::asio::buffer_size(replybuf));
163161
}
164162
else if (!result)
165163
{
166164
reply_ = http::server::reply::stock_reply(http::server::reply::bad_request);
167-
//std::vector<boost::asio::const_buffer> replybuf = reply_.to_buffers();
168-
//response = std::string(boost::asio::buffers_begin(replybuf), boost::asio::buffers_begin(replybuf) + boost::asio::buffer_size(replybuf));
169165
}
170166
else
171167
{
@@ -376,12 +372,7 @@ void CProxyManager::StartThread()
376372
{
377373
try {
378374
boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
379-
#if 0
380-
ctx.set_verify_mode(boost::asio::ssl::context::verify_peer);
381-
ctx.load_verify_file("ca.pem");
382-
#else
383375
ctx.set_verify_mode(boost::asio::ssl::verify_none);
384-
#endif
385376

386377
proxyclient = new CProxyClient(io_service, ctx, m_pWebEm);
387378

0 commit comments

Comments
 (0)