diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2013-10-18 21:38:01 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2013-10-18 21:38:01 +0800 |
| commit | 45bd0edae52c07daa2d54ca7f7c0a57d51130791 (patch) | |
| tree | 38ab731e4c38f1e287c187a9ca14ea73a92f9434 /common-channel.c | |
| parent | aafeebd0c841494e4f7315890bc97ed0daf99cbd (diff) | |
| parent | 3d733a16e9ee856a45a1fbd9a1b48005d78063f9 (diff) | |
Merge in changes from the past couple of releases
--HG--
branch : ecc
Diffstat (limited to 'common-channel.c')
| -rw-r--r-- | common-channel.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/common-channel.c b/common-channel.c index 8b7369c..2068904 100644 --- a/common-channel.c +++ b/common-channel.c @@ -307,7 +307,9 @@ static void check_close(struct Channel *channel) { return; } - if (channel->recv_eof && !write_pending(channel)) { + if ((channel->recv_eof && !write_pending(channel)) + /* have a server "session" and child has exited */ + || (channel->type->check_close && close_allowed)) { close_chan_fd(channel, channel->writefd, SHUT_WR); } @@ -336,6 +338,7 @@ static void check_close(struct Channel *channel) { /* And if we can't receive any more data from them either, close up */ if (channel->readfd == FD_CLOSED + && channel->writefd == FD_CLOSED && (ERRFD_IS_WRITE(channel) || channel->errfd == FD_CLOSED) && !channel->sent_close && close_allowed |