X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9383ac2311caa190a93fd6694c6c82390cabf044..b917dfff6eaf472363fd4933e9c2239eb2e6877f:/test/mhfixmsg/test-mhfixmsg?ds=sidebyside diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg index 152b11c7..bd63446a 100755 --- a/test/mhfixmsg/test-mhfixmsg +++ b/test/mhfixmsg/test-mhfixmsg @@ -212,13 +212,13 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart" ------=_nmh-multipart Content-Type: text/plain; charset="Windows-1252" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit Need to go! Need ... to ... go! ------=_nmh-multipart Content-Type: text/html; charset="Windows-1252" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit @@ -291,7 +291,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart-3" ------=_nmh-multipart-3 Content-Type: text/plain; charset="Windows-1252" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit ------=_nmh-multipart ------=_nmh-multipart-1 @@ -299,7 +299,7 @@ Content-Transfer-Encoding: 8bit ------=_nmh-multipart-3 Content-Type: text/html; charset="Windows-1252" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit @@ -369,7 +369,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart" ------=_nmh-multipart Content-Type: text/plain; charset="Windows-1252" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit Need to go! Need ... to ... go! @@ -443,7 +443,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt" Content-Disposition: attachment; filename="test4.txt" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is a text/plain part. @@ -500,7 +500,7 @@ This is additional content after the last subpart of the multipart. Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: attachment; filename="test2.txt" Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA== -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is the second text/plain part. @@ -513,7 +513,7 @@ This is the third text/plain part. ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="iso-8859-1"; name="test4.txt" Content-Disposition: attachment; filename="test4.txt" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is the fourth text/plain part. @@ -586,7 +586,7 @@ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" ------- =_aaaaaaaaaa0 -Content-Type: text/plain; charset=UTF-8; name="nul+square.txt" +Content-Type: text/plain; charset="UTF-8"; name="nul+square.txt" Content-Transfer-Encoding: base64 vbI9vAAK @@ -611,7 +611,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="iso-8859-1" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is a text plain part @@ -700,7 +700,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" ------- =_aaaaaaaaaa0 Content-Type: text/plain; charset="iso-8859-1" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is a text plain part @@ -727,7 +727,7 @@ MIME-Version: 1.0 Content-Type: multipart/mixed; boundary=\"----- =_aaaaaaaaaa0\" ------- =_aaaaaaaaaa0 -Content-Type: text/plain; charset=UTF-8; name=\"nul+square.txt\" +Content-Type: text/plain; charset=\"UTF-8\"; name=\"nul+square.txt\" Content-Transfer-Encoding: binary " " @@ -750,7 +750,7 @@ Content-Type: multipart/alternative; boundary="----=_nmh-multipart" ------=_nmh-multipart Content-Type: text/plain; charset="ISO-8859-1" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit Mile $0.00 Time $78.71 @@ -1198,7 +1198,7 @@ Content-Type: multipart/alternative; boundary="----=_Part_876302" ------=_Part_876302 Content-Type: text/plain; charset="UTF-8" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit Yes, the text/plain part really was empty. @@ -1428,14 +1428,14 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: attachment; filename="test1.txt" Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA== -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is the text/plain part. ------- =_aaaaaaaaaa0 Content-Type: text/html; charset="iso-8859-1"; name="test2.txt" Content-Disposition: attachment; filename="test2.txt" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit @@ -1489,7 +1489,7 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: attachment; filename="test1.txt" Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA== -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is the text/plain part. @@ -1546,14 +1546,14 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: attachment; filename="test1.txt" Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA== -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is the text/plain part. ------- =_aaaaaaaaaa0 Content-Type: application/ics; charset="iso-8859-1"; name="invite.ics" Content-Disposition: attachment; filename="invite.ics" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit BEGIN:VCALENDAR VERSION:2.0 @@ -1614,14 +1614,14 @@ Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0" Content-Type: text/plain; charset="iso-8859-1" Content-Disposition: attachment; filename="test1.txt" Content-MD5: kq+Hnc2SD/eKwAnkFBDuEA== -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit This is the text/plain part. ------- =_aaaaaaaaaa0 Content-Type: application/ics; charset="iso-8859-1"; name="invite.ics" Content-Disposition: attachment; filename="invite.ics" -Content-Transfer-Encoding: 8bit +Content-Transfer-Encoding: 7bit BEGIN:VCALENDAR VERSION:2.0 @@ -1715,6 +1715,58 @@ set -e check `mhpath last` "$actual" +start_test "fix RFC 2047 encoded header parameters" +cat >"$expected" <`mhpath new` <"$actual" 2>/dev/null +check "$expected" "$actual" + + # make sure there are no tmp files left over find "$MH_TEST_DIR/Mail" \( -name 'mhfix*' -o -name ',mhfix*' \) -print \ >"$actual"