Mercurial > dovecot > original-hg > dovecot-1.2
changeset 5591:cf45e0fdcf52 HEAD
We sent "Hang in there.." too early sometimes and checked it too often.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Fri, 11 May 2007 20:31:50 +0300 |
| parents | eb4902fc7693 |
| children | 29ac17ec78ff |
| files | src/imap/cmd-copy.c |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/imap/cmd-copy.c Fri May 11 17:07:04 2007 +0300 +++ b/src/imap/cmd-copy.c Fri May 11 20:31:50 2007 +0300 @@ -12,13 +12,14 @@ static void client_send_sendalive_if_needed(struct client *client) { - time_t now; + time_t now, last_io; if (o_stream_get_buffer_used_size(client->output) != 0) return; now = time(NULL); - if (now - client->last_output > MAIL_STORAGE_STAYALIVE_SECS) { + last_io = I_MAX(client->last_input, client->last_output); + if (now - last_io > MAIL_STORAGE_STAYALIVE_SECS) { o_stream_send_str(client->output, "* OK Hang in there..\r\n"); o_stream_flush(client->output); client->last_output = now; @@ -56,7 +57,7 @@ break; } - if ((++copy_count % COPY_CHECK_INTERVAL) != 0) + if ((++copy_count % COPY_CHECK_INTERVAL) == 0) client_send_sendalive_if_needed(client); keywords_list = mail_get_keywords(mail);