In expand_pseudoheader(), set Content-Type to 7-bit for ASCII text.

[nmh] / test / mhfixmsg / test-mhfixmsg
diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg

index cac5fb84edb95c53940dca65c3de612132346583..cc69aea7a6ffcd9d7aa3e1bfab22e74e4f438dbc 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -57,6 +57,7 @@ Usage: mhfixmsg [+folder] [msgs] [switches]
    -outfile file
    -rmmproc program
    -normmproc
+  -[no]changecur
    -[no]verbose
    -version
    -help
@@ -465,8 +466,7 @@ This is additional content before the first subpart of the multipart.
  
  ------- =_aaaaaaaaaa0
  Content-Type: multipart/related;
-    type="multipart/alternative";
-    boundary="subpart__1.1"
+    type="text/plain"; boundary="subpart__1.1"
  
  --subpart__1.1
  Content-Type: text/plain; charset="iso-8859-1"
@@ -515,8 +515,7 @@ This is additional content before the first subpart of the multipart.
  
  ------- =_aaaaaaaaaa0
  Content-Type: multipart/related;
-    type="multipart/alternative";
-    boundary="subpart__1.1"
+    type="text/plain"; boundary="subpart__1.1"
  
  --subpart__1.1
  Content-Type: text/plain; charset="iso-8859-1"
@@ -793,24 +792,16 @@ run_test 'mhfixmsg last -outfile '"$actual"' -verbose' \
  check "$expected" "$actual"
  
  
-# check that text/plain part is added to lone text/html in multipart/related
-prepare_space >"$expected" <<EOF
+# check that text/plain part is not added to text/html in multipart/related
+# when it shouldn't be
+cat >`mhpath new` <<EOF
  MIME-Version: 1.0
  Date: Tue, 26 Feb 2013 18:07:20 -0600
  Subject: multipart/related, not /alternative
  Content-Type: multipart/related;
-        boundary="----=_Part_90310_101292502.1"
+        type="text/html"; boundary="----=_Part_90310_101292502.1"
  
  ------=_Part_90310_101292502.1
-Content-Type: multipart/alternative; boundary="----=_nmh-multipart1"
-
-------=_nmh-multipart1
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-
-This is the real content.
-
-------=_nmh-multipart1
  Content-Type: text/html; charset="us-ascii"
  Content-Transfer-Encoding: 7bit
  
@@ -823,8 +814,6 @@ Content-Transfer-Encoding: 7bit
    </body>
  </html>
  
-------=_nmh-multipart1--
-
  ------=_Part_90310_101292502.1
  Content-Type: text/plain; charset="us-ascii"
  Content-Transfer-Encoding: 7bit
@@ -834,32 +823,7 @@ Your email client does not support HTML messages
  ------=_Part_90310_101292502.1--
  EOF
  
-cat >`mhpath new` <<EOF
-MIME-Version: 1.0
-Date: Tue, 26 Feb 2013 18:07:20 -0600
-Subject: multipart/related, not /alternative
-Content-Type: multipart/related;
-        boundary="----=_Part_90310_101292502.1"
-
-------=_Part_90310_101292502.1
-Content-Type: text/html; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-
-<html><head>
-    <meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
-    <title>HTML Content</title>
-  </head>
-  <body>
-    This is the real content.
-  </body>
-</html>
-------=_Part_90310_101292502.1
-Content-Type: text/plain; charset="us-ascii"
-Content-Transfer-Encoding: 7bit
-
-Your email client does not support HTML messages
-------=_Part_90310_101292502.1--
-EOF
+cp -p `mhpath last` "$expected"
  
  if [ $can_reformat_texthtml -eq 1 ]; then
    #### lynx inserts multiple blank lines, so squeeze them.
@@ -1065,6 +1029,58 @@ run_prog mhfixmsg last -replacetextplain -noreplacetextplain -outfile "$actual"
  check "$expected" "$actual"
  
  
+# check removal of extraneous trailing semicolon from header parameter list
+cat >"$expected" <<EOF
+To: recipient@example.com
+Subject: test
+From: sender@example.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii"
+
+test
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii";
+ name="DATE"
+Content-Description: check folded headers, with and without trailing semicolon
+Content-Disposition: attachment;
+ filename="DATE"
+
+14 April 2014
+
+------- =_aaaaaaaaaa0--
+EOF
+
+cat >`mhpath new` <<EOF
+To: recipient@example.com
+Subject: test
+From: sender@example.com
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii";
+
+test
+
+------- =_aaaaaaaaaa0
+Content-Type: text/plain; charset="us-ascii";
+ name="DATE"
+Content-Description: check folded headers, with and without trailing semicolon
+Content-Disposition: attachment;
+ filename="DATE";
+
+14 April 2014
+
+------- =_aaaaaaaaaa0--
+EOF
+run_test 'mhfixmsg last -outfile '"$actual" ''
+check "$expected" "$actual"
+
+
  # check rmmproc
  cat >"$MH_TEST_DIR/Mail/rmmproc" <<'EOF'
  mv "$1" "$1.backup"