From 626bec8e84cace23b53473d79789f2544a5e85ce Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 5 Apr 2005 20:07:42 +0000 Subject: [PATCH] - Added maybe_flush_socket() for use by the generator. - Always maintain the last_io value for the generator. --- io.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/io.c b/io.c index bdfebafc..fdaa7134 100644 --- a/io.c +++ b/io.c @@ -574,7 +574,7 @@ static int read_timeout(int fd, char *buf, size_t len) len -= n; ret += n; - if (io_timeout && fd == sock_f_in) + if (fd == sock_f_in && (io_timeout || am_generator)) last_io = time(NULL); } @@ -665,6 +665,13 @@ void io_end_buffering(void) } +void maybe_flush_socket(void) +{ + if (iobuf_out && iobuf_out_cnt && time(NULL) - last_io >= 5) + io_flush(NORMAL_FLUSH); +} + + void maybe_send_keepalive(void) { if (time(NULL) - last_io >= allowed_lull) { @@ -1089,7 +1096,7 @@ static void writefd_unbuffered(int fd,char *buf,size_t len) total += ret; if (fd == sock_f_out) { - if (io_timeout) + if (io_timeout || am_generator) last_io = time(NULL); sleep_for_bwlimit(ret); } -- 2.34.1