Merge branch 'master' into web-ui

This commit is contained in:
EinMByte 2015-08-16 23:34:39 +02:00
commit 3cc95c0df2
8 changed files with 32 additions and 24 deletions

View file

@ -518,15 +518,7 @@ namespace util
void HTTPConnection::Terminate ()
{
if (!m_Stream) return;
m_Socket->close ();
m_Stream->Close ();
m_Socket->get_io_service ().post ([=](void)
{
m_Stream.reset ();
m_Stream = nullptr;
});
}
void HTTPConnection::Receive ()