diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | channels.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20031122 | ||
2 | - (dtucker) [channels.c] Make AIX write limit code clearer. Suggested by djm@ | ||
3 | |||
1 | 20031121 | 4 | 20031121 |
2 | - (djm) OpenBSD CVS Sync | 5 | - (djm) OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2003/11/20 11:39:28 | 6 | - markus@cvs.openbsd.org 2003/11/20 11:39:28 |
@@ -1498,4 +1501,4 @@ | |||
1498 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1501 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1499 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1502 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1500 | 1503 | ||
1501 | $Id: ChangeLog,v 1.3119 2003/11/21 12:48:55 djm Exp $ | 1504 | $Id: ChangeLog,v 1.3120 2003/11/22 03:10:02 dtucker Exp $ |
diff --git a/channels.c b/channels.c index 25f85c8b7..5a2605f91 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1398,8 +1398,8 @@ channel_handle_wfd(Channel *c, fd_set * readset, fd_set * writeset) | |||
1398 | dlen = buffer_len(&c->output); | 1398 | dlen = buffer_len(&c->output); |
1399 | #ifdef _AIX | 1399 | #ifdef _AIX |
1400 | /* XXX: Later AIX versions can't push as much data to tty */ | 1400 | /* XXX: Later AIX versions can't push as much data to tty */ |
1401 | if (compat20 && c->wfd_isatty && dlen > 8*1024) | 1401 | if (compat20 && c->wfd_isatty) |
1402 | dlen = 8*1024; | 1402 | dlen = MIN(dlen, 8*1024); |
1403 | #endif | 1403 | #endif |
1404 | len = write(c->wfd, data, dlen); | 1404 | len = write(c->wfd, data, dlen); |
1405 | if (len < 0 && (errno == EINTR || errno == EAGAIN)) | 1405 | if (len < 0 && (errno == EINTR || errno == EAGAIN)) |