Commit d6153b13 d6153b1307bf9ab9242d4f9f76592d346ebc6ec1 by Sergey Poznyakoff

Minor change.

* pop3d/extra.c (pop3d_setio): Use the canonic name of the CRLF
filter, instead of the legacy "rfc822".
* imap4d/fetch.c: Likewise.
* imap4d/util.c: Likewise.
1 parent 29d2e390
......@@ -693,7 +693,7 @@ fetch_io (mu_stream_t stream, size_t start, size_t size, size_t max)
size_t n = 0;
mu_filter_create (&rfc, stream, "rfc822", MU_FILTER_ENCODE,
mu_filter_create (&rfc, stream, "CRLF", MU_FILTER_ENCODE,
MU_STREAM_READ|MU_STREAM_SEEK);
if (start == 0 && size == (size_t) -1)
......
......@@ -816,14 +816,14 @@ util_setio (FILE *in, FILE *out)
if (mu_stdio_stream_create (&tmp, fileno (in), 0))
imap4d_bye (ERR_NO_IFILE);
mu_stream_set_buffer (tmp, mu_buffer_line, 1024);
mu_filter_create (&istream, tmp, "rfc822", MU_FILTER_DECODE,
mu_filter_create (&istream, tmp, "CRLF", MU_FILTER_DECODE,
MU_STREAM_READ | MU_STREAM_AUTOCLOSE);
mu_stream_set_buffer (istream, mu_buffer_line, 1024);
if (mu_stdio_stream_create (&tmp, fileno (out), 0))
imap4d_bye (ERR_NO_OFILE);
mu_stream_set_buffer (tmp, mu_buffer_line, 1024);
mu_filter_create (&ostream, tmp, "rfc822", MU_FILTER_ENCODE,
mu_filter_create (&ostream, tmp, "CRLF", MU_FILTER_ENCODE,
MU_STREAM_WRITE | MU_STREAM_AUTOCLOSE);
mu_stream_set_buffer (ostream, mu_buffer_line, 1024);
}
......
......@@ -151,11 +151,12 @@ pop3d_setio (FILE *in, FILE *out)
/* Convert all writes to CRLF form.
There is no need to convert reads, as the code ignores extra \r anyway.
This also installs an extra full buffering, which is needed for TLS
code (see below). */
if (mu_filter_create (&iostream, str, "rfc822", MU_FILTER_ENCODE,
*/
if (mu_filter_create (&iostream, str, "CRLF", MU_FILTER_ENCODE,
MU_STREAM_WRITE | MU_STREAM_RDTHRU))
pop3d_abquit (ERR_NO_IFILE);
/* Change buffering scheme: filter streams are fully buffered by default. */
mu_stream_set_buffer (iostream, mu_buffer_line, 1024);
if (pop3d_transcript)
{
......