diff --git a/HTTPServer.cpp b/HTTPServer.cpp index b7a2989a..27e6f0a1 100644 --- a/HTTPServer.cpp +++ b/HTTPServer.cpp @@ -13,6 +13,103 @@ namespace i2p { namespace util { + + const std::string HTTPConnection::itoopieImage = + "\"\""; + namespace misc_strings { diff --git a/HTTPServer.h b/HTTPServer.h index dca004b0..df9ca4e7 100644 --- a/HTTPServer.h +++ b/HTTPServer.h @@ -13,9 +13,8 @@ namespace util { class HTTPConnection { - const std::string itoopieImage = "\"\""; - protected: + struct header { std::string name; @@ -69,8 +68,13 @@ namespace util reply m_Reply; protected: + virtual void HandleDestinationRequest(const std::string& address, const std::string& uri); virtual void RunRequest (); + + private: + + static const std::string itoopieImage; }; class HTTPServer diff --git a/Streaming.cpp b/Streaming.cpp index bf8eacd3..facf68b4 100644 --- a/Streaming.cpp +++ b/Streaming.cpp @@ -60,7 +60,8 @@ namespace stream } // send ack for last message - SendQuickAck (); + if (m_IsOpen) + SendQuickAck (); } else { @@ -127,9 +128,9 @@ namespace stream if (flags & PACKET_FLAG_CLOSE) { LogPrint ("Closed"); + SendQuickAck (); // send ack for close explicitly? m_IsOpen = false; m_ReceiveQueue.WakeUp (); - m_ReceiveTimer.cancel (); } }