1998-07-21 13:46:05 +00:00
|
|
|
*** pine/send.c.orig Mon Jul 20 22:02:18 1998
|
|
|
|
--- pine/send.c Tue Jul 21 14:51:50 1998
|
1997-07-19 23:27:37 +00:00
|
|
|
***************
|
1998-07-21 13:46:05 +00:00
|
|
|
*** 6672,6684 ****
|
1997-07-19 23:27:37 +00:00
|
|
|
body->subtype = cpystr("octet-stream");
|
|
|
|
}
|
|
|
|
|
1998-07-18 05:49:22 +00:00
|
|
|
! /*
|
|
|
|
! * Apply maximal encoding regardless of previous
|
|
|
|
! * setting. This segment's either not text, or is
|
|
|
|
! * unlikely to be readable with > 30% of the
|
|
|
|
! * text encoded anyway, so we might as well save space...
|
|
|
|
! */
|
1997-07-19 23:27:37 +00:00
|
|
|
! new_encoding = ENCBINARY; /* > 30% 8 bit chars */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1998-07-21 13:46:05 +00:00
|
|
|
--- 6672,6688 ----
|
1997-07-19 23:27:37 +00:00
|
|
|
body->subtype = cpystr("octet-stream");
|
|
|
|
}
|
|
|
|
|
1998-07-18 05:49:22 +00:00
|
|
|
! if(body->type == TYPETEXT)
|
|
|
|
! /* Use ENC8BIT rather than ENCBINARY for TEXT */
|
|
|
|
! new_encoding = ENC8BIT;
|
|
|
|
! else
|
|
|
|
! /*
|
|
|
|
! * Apply maximal encoding regardless of previous
|
|
|
|
! * setting. This segment's either not text, or is
|
|
|
|
! * unlikely to be readable with > 30% of the
|
|
|
|
! * text encoded anyway, so we might as well save space...
|
|
|
|
! */
|
1997-07-19 23:27:37 +00:00
|
|
|
! new_encoding = ENCBINARY; /* > 30% 8 bit chars */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-02-04 19:12:52 +00:00
|
|
|
***************
|
1998-07-21 13:46:05 +00:00
|
|
|
*** 7508,7514 ****
|
1997-02-04 19:12:52 +00:00
|
|
|
|
|
|
|
switch (body->encoding) { /* all else needs filtering */
|
|
|
|
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
|
1998-07-18 05:49:22 +00:00
|
|
|
! gf_link_filter(gf_8bit_qp, NULL);
|
1997-02-04 19:12:52 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ENCBINARY: /* encode binary into BASE64 */
|
1998-07-21 13:46:05 +00:00
|
|
|
--- 7512,7519 ----
|
1997-02-04 19:12:52 +00:00
|
|
|
|
|
|
|
switch (body->encoding) { /* all else needs filtering */
|
|
|
|
case ENC8BIT: /* encode 8BIT into QUOTED-PRINTABLE */
|
1998-07-18 05:49:22 +00:00
|
|
|
! if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
|
|
|
|
! gf_link_filter(gf_8bit_qp, NULL);
|
1997-02-04 19:12:52 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ENCBINARY: /* encode binary into BASE64 */
|
|
|
|
***************
|
1998-07-21 13:46:05 +00:00
|
|
|
*** 7575,7581 ****
|
1998-07-18 05:49:22 +00:00
|
|
|
sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
|
1997-02-04 19:12:52 +00:00
|
|
|
body_encodings[(body->encoding == ENCBINARY)
|
|
|
|
? ENCBASE64
|
|
|
|
! : (body->encoding == ENC8BIT)
|
|
|
|
? ENCQUOTEDPRINTABLE
|
|
|
|
: (body->encoding <= ENCMAX)
|
|
|
|
? body->encoding : ENCOTHER]);
|
1998-07-21 13:46:05 +00:00
|
|
|
--- 7580,7586 ----
|
1998-07-18 05:49:22 +00:00
|
|
|
sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
|
1997-02-04 19:12:52 +00:00
|
|
|
body_encodings[(body->encoding == ENCBINARY)
|
|
|
|
? ENCBASE64
|
|
|
|
! : (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
|
|
|
|
? ENCQUOTEDPRINTABLE
|
|
|
|
: (body->encoding <= ENCMAX)
|
|
|
|
? body->encoding : ENCOTHER]);
|