Merge remote-tracking branch 'purple/openssl' into merge_udp_tunnel

This commit is contained in:
Jeff Becker 2016-09-07 15:08:45 -04:00
commit b6b14f4957
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
8 changed files with 247 additions and 7 deletions

View file

@ -829,7 +829,13 @@ namespace http {
std::shared_ptr<boost::asio::ip::tcp::socket> newSocket)
{
if (ecode)
{
if(newSocket) newSocket->close();
LogPrint(eLogError, "HTTP Server: error handling accept ", ecode.message());
if(ecode != boost::asio::error::operation_aborted)
Accept();
return;
}
CreateConnection(newSocket);
Accept ();
}