dovecot-2.1: pop3c: Fixes to handling filter streams for mail.

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/fa7e1246e0e2
changeset: 14063:fa7e1246e0e2
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Feb 02 23:22:06 2012 +0200
description:
pop3c: Fixes to handling filter streams for mail.

diffstat:

 src/lib-storage/index/pop3c/pop3c-client.c |  3 +++
 src/lib-storage/index/pop3c/pop3c-mail.c   |  2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r f31a227ae381 -r fa7e1246e0e2 src/lib-storage/index/pop3c/pop3c-client.c
--- a/src/lib-storage/index/pop3c/pop3c-client.c	Thu Feb 02 17:20:02 2012 +0200
+++ b/src/lib-storage/index/pop3c/pop3c-client.c	Thu Feb 02 23:22:06 2012 +0200
@@ -774,6 +774,9 @@
 	}
 	io_remove(&client->io);
 	i_stream_seek(client->dot_input, 0);
+	/* if this stream is used by some filter stream, make the filter
+	   stream blocking */
+	client->dot_input->blocking = TRUE;
 
 	*input_r = client->dot_input;
 	client->dot_input = NULL;
diff -r f31a227ae381 -r fa7e1246e0e2 src/lib-storage/index/pop3c/pop3c-mail.c
--- a/src/lib-storage/index/pop3c/pop3c-mail.c	Thu Feb 02 17:20:02 2012 +0200
+++ b/src/lib-storage/index/pop3c/pop3c-mail.c	Thu Feb 02 23:22:06 2012 +0200
@@ -121,7 +121,6 @@
 				MAIL_ERROR_TEMP : MAIL_ERROR_EXPUNGED, error);
 			return -1;
 		}
-		i_stream_set_name(input, t_strcut(cmd, '\r'));
 		mail->data.stream = input;
 		if (mail->mail.v.istream_opened != NULL) {
 			if (mail->mail.v.istream_opened(_mail,
@@ -130,6 +129,7 @@
 				return -1;
 			}
 		}
+		i_stream_set_name(mail->data.stream, t_strcut(cmd, '\r'));
 		pop3c_mail_cache_size(mail);
 	}
 	return index_mail_init_stream(mail, hdr_size, body_size, stream_r);