diff options
| author | peter <peter@FreeBSD.org> | 1999-02-07 09:40:41 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-02-07 09:40:41 +0000 |
| commit | ab5a9cbab45b524bd67604dcdbe60870697848d2 (patch) | |
| tree | 3d5cbf462390cf6c6ed3bc71b85e84ffae40948f /contrib/sendmail/src/mime.c | |
| parent | 7a0029ee87f579bf3090db5b0fba045030753bbb (diff) | |
| parent | 19c8fca2df7a6f39e5208229f428ec269fb3adbf (diff) | |
| download | FreeBSD-src-ab5a9cbab45b524bd67604dcdbe60870697848d2.zip FreeBSD-src-ab5a9cbab45b524bd67604dcdbe60870697848d2.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r43730,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/sendmail/src/mime.c')
| -rw-r--r-- | contrib/sendmail/src/mime.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/contrib/sendmail/src/mime.c b/contrib/sendmail/src/mime.c index a1429cb..7156891 100644 --- a/contrib/sendmail/src/mime.c +++ b/contrib/sendmail/src/mime.c @@ -14,7 +14,7 @@ # include <string.h> #ifndef lint -static char sccsid[] = "@(#)mime.c 8.70 (Berkeley) 11/10/1998"; +static char sccsid[] = "@(#)mime.c 8.71 (Berkeley) 1/18/1999"; #endif /* not lint */ /* @@ -308,7 +308,7 @@ mime8to7(mci, header, e, boundaries, flags) collect(e->e_dfp, FALSE, &hdr, e); if (tTd(43, 101)) putline("+++after collect", mci); - putheader(mci, hdr, e); + putheader(mci, hdr, e, flags); if (tTd(43, 101)) putline("+++after putheader", mci); bt = mime8to7(mci, hdr, e, boundaries, flags); @@ -360,7 +360,7 @@ mime8to7(mci, header, e, boundaries, flags) collect(e->e_dfp, FALSE, &hdr, e); if (tTd(43, 101)) putline("+++after collect", mci); - putheader(mci, hdr, e); + putheader(mci, hdr, e, flags); if (tTd(43, 101)) putline("+++after putheader", mci); if (hvalue("MIME-Version", hdr) == NULL) @@ -442,11 +442,16 @@ mime8to7(mci, header, e, boundaries, flags) if (sectionhighbits == 0) { /* no encoding necessary */ - if (cte != NULL && bitset(MCIF_INMIME, mci->mci_flags)) + if (cte != NULL && + bitset(MCIF_INMIME, mci->mci_flags) && + !bitset(M87F_NO8TO7, flags)) { /* - ** Skip _unless_ in MIME mode; see putheader() for the - ** counterpart where this is skipped _if_ in MIME mode. + ** Skip _unless_ in MIME mode and potentially + ** converting from 8 bit to 7 bit MIME. See + ** putheader() for the counterpart where the + ** CTE header is skipped in the opposite + ** situation. */ snprintf(buf, sizeof buf, |
