merge of c9dc9c734d4724866a86987356e6aedeed1c93dd

and fe38e5c38c2e7d5a4bb76aee511d345f1c2d5ac2

--HG--
extra : convert_revision : 8f25eab3ed6221e164894808fbb8bc461b5cbdaf
This commit is contained in:
Matt Johnston 2006-01-25 17:14:32 +00:00
commit 096ac021a9

View File

@ -377,7 +377,7 @@ static void writechannel(struct Channel* channel, int fd, circbuffer *cbuf) {
cbuf_incrread(cbuf, len);
channel->recvdonelen += len;
if (fd == channel->writefd && len == maxlen && channel->recveof) {
if (fd == channel->writefd && cbuf_getused(cbuf) == 0 && channel->recveof) {
/* Check if we're closing up */
closewritefd(channel);
TRACE(("leave writechannel: recveof set"))