Merge tag 'v0.19.17'

release v0.19.17
This commit is contained in:
Max Kellermann
2016-07-09 00:46:09 +02:00
15 changed files with 221 additions and 122 deletions

View File

@@ -118,9 +118,15 @@ BufferedSocket::OnSocketReady(unsigned flags)
if (flags & READ) {
assert(!input.IsFull());
if (!ReadToBuffer() || !ResumeInput())
if (!ReadToBuffer())
return false;
if (!ResumeInput())
/* we must return "true" here or
SocketMonitor::Dispatch() will call
Cancel() on a freed object */
return true;
if (!input.IsFull())
ScheduleRead();
}