Merge branch 'master' of github.com:janvidar/uhub into sans_libevent

This commit is contained in:
Jan Vidar Krey
2010-01-19 19:35:20 +01:00
6 changed files with 148 additions and 5 deletions

View File

@@ -111,11 +111,11 @@ int handle_net_read(struct hub_user* user)
start = pos;
}
if (lastPos)
if (lastPos || remaining)
{
if (remaining < g_hub->config->max_recv_buffer)
{
hub_recvq_set(q, lastPos, remaining);
hub_recvq_set(q, lastPos ? lastPos : buf, remaining);
}
else
{