1
0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-02-04 04:44:14 +00:00

read reamaining data from closed stream

This commit is contained in:
orignal 2014-12-26 08:55:24 -05:00
parent bbe403fb40
commit 64df22def8
2 changed files with 9 additions and 7 deletions

View File

@ -462,17 +462,18 @@ namespace client
{
if (bytes_transferred)
response.write ((char *)buf, bytes_transferred);
else
{
if (ecode != boost::asio::error::timed_out || !stream->IsOpen ())
end = true;
}
if (ecode == boost::asio::error::timed_out || !stream->IsOpen ())
end = true;
newDataReceived.notify_all ();
},
30); // wait for 30 seconds
std::unique_lock<std::mutex> l(newDataReceivedMutex);
newDataReceived.wait (l);
}
// process remaining buffer
while (size_t len = stream->ReadSome (buf, 4096))
response.write ((char *)buf, len);
// parse response
std::string version;
response >> version; // HTTP version

View File

@ -100,7 +100,8 @@ namespace stream
template<typename Buffer, typename ReceiveHandler>
void AsyncReceive (const Buffer& buffer, ReceiveHandler handler, int timeout = 0);
size_t ReadSome (uint8_t * buf, size_t len) { return ConcatenatePackets (buf, len); };
void Close ();
void Cancel () { m_ReceiveTimer.cancel (); };
@ -225,7 +226,7 @@ namespace stream
else
// socket closed
handler (m_IsReset ? boost::asio::error::make_error_code (boost::asio::error::connection_reset) :
boost::asio::error::make_error_code (boost::asio::error::operation_aborted), 0);
boost::asio::error::make_error_code (boost::asio::error::operation_aborted), received);
}
else
// timeout expired