From b51203bc831da877e8d53cbc6a3d6e6638b5156c Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 21 Nov 2012 07:19:57 +0000 Subject: [PATCH] Merged r10853 from trunk (#12399) svn propset svn:eol-style native to fixtures. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.1-stable@10855 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../gmail_with_attachment_iso-8859-1.eml | 52 +++++++------- .../mail_handler/gmail_with_attachment_ja.eml | 40 +++++------ ...thunderbird_with_attachment_iso-8859-1.eml | 68 +++++++++---------- .../thunderbird_with_attachment_ja.eml | 52 +++++++------- 4 files changed, 106 insertions(+), 106 deletions(-) diff --git a/test/fixtures/mail_handler/gmail_with_attachment_iso-8859-1.eml b/test/fixtures/mail_handler/gmail_with_attachment_iso-8859-1.eml index 4f1f6f347..419976e95 100644 --- a/test/fixtures/mail_handler/gmail_with_attachment_iso-8859-1.eml +++ b/test/fixtures/mail_handler/gmail_with_attachment_iso-8859-1.eml @@ -1,26 +1,26 @@ -Date: Tue, 20 Nov 2012 23:08:25 +0900 -Message-ID: -Subject: test -From: John Smith -To: redmine@somenet.foo -Content-Type: multipart/mixed; boundary=14dae93a13bf76ca5d04ceedc458 - ---14dae93a13bf76ca5d04ceedc458 -Content-Type: text/plain; charset=ISO-8859-1 - -test - ---14dae93a13bf76ca5d04ceedc458 -Content-Type: text/plain; charset=US-ASCII; - name="=?ISO-8859-1?B?xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tw=?= - =?ISO-8859-1?B?/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc?= - =?ISO-8859-1?B?/MTk1vbc/C50eHQ=?=" -Content-Disposition: attachment; - filename="=?ISO-8859-1?B?xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tw=?= - =?ISO-8859-1?B?/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc?= - =?ISO-8859-1?B?/MTk1vbc/C50eHQ=?=" -Content-Transfer-Encoding: base64 -X-Attachment-Id: f_h9r3mcjz0 - -dGVzdAo= ---14dae93a13bf76ca5d04ceedc458-- +Date: Tue, 20 Nov 2012 23:08:25 +0900 +Message-ID: +Subject: test +From: John Smith +To: redmine@somenet.foo +Content-Type: multipart/mixed; boundary=14dae93a13bf76ca5d04ceedc458 + +--14dae93a13bf76ca5d04ceedc458 +Content-Type: text/plain; charset=ISO-8859-1 + +test + +--14dae93a13bf76ca5d04ceedc458 +Content-Type: text/plain; charset=US-ASCII; + name="=?ISO-8859-1?B?xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tw=?= + =?ISO-8859-1?B?/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc?= + =?ISO-8859-1?B?/MTk1vbc/C50eHQ=?=" +Content-Disposition: attachment; + filename="=?ISO-8859-1?B?xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tz8xOTW9tw=?= + =?ISO-8859-1?B?/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc/MTk1vbc?= + =?ISO-8859-1?B?/MTk1vbc/C50eHQ=?=" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_h9r3mcjz0 + +dGVzdAo= +--14dae93a13bf76ca5d04ceedc458-- diff --git a/test/fixtures/mail_handler/gmail_with_attachment_ja.eml b/test/fixtures/mail_handler/gmail_with_attachment_ja.eml index 8d4e4f334..71a1571c5 100644 --- a/test/fixtures/mail_handler/gmail_with_attachment_ja.eml +++ b/test/fixtures/mail_handler/gmail_with_attachment_ja.eml @@ -1,20 +1,20 @@ -Date: Mon, 19 Nov 2012 10:17:45 +0900 -Message-ID: -Subject: test -From: John Smith -To: redmine@somenet.foo -Content-Type: multipart/mixed; boundary=bcaec54ee4ea84f77904cecee22e - ---bcaec54ee4ea84f77904cecee22e -Content-Type: text/plain; charset=ISO-8859-1 - -test - ---bcaec54ee4ea84f77904cecee22e -Content-Type: text/plain; charset=US-ASCII; name="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?=" -Content-Disposition: attachment; filename="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?=" -Content-Transfer-Encoding: base64 -X-Attachment-Id: f_h9owndpv0 - -dGVzdAo= ---bcaec54ee4ea84f77904cecee22e-- +Date: Mon, 19 Nov 2012 10:17:45 +0900 +Message-ID: +Subject: test +From: John Smith +To: redmine@somenet.foo +Content-Type: multipart/mixed; boundary=bcaec54ee4ea84f77904cecee22e + +--bcaec54ee4ea84f77904cecee22e +Content-Type: text/plain; charset=ISO-8859-1 + +test + +--bcaec54ee4ea84f77904cecee22e +Content-Type: text/plain; charset=US-ASCII; name="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?=" +Content-Disposition: attachment; filename="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?=" +Content-Transfer-Encoding: base64 +X-Attachment-Id: f_h9owndpv0 + +dGVzdAo= +--bcaec54ee4ea84f77904cecee22e-- diff --git a/test/fixtures/mail_handler/thunderbird_with_attachment_iso-8859-1.eml b/test/fixtures/mail_handler/thunderbird_with_attachment_iso-8859-1.eml index 89ad4a904..2ee104c4f 100644 --- a/test/fixtures/mail_handler/thunderbird_with_attachment_iso-8859-1.eml +++ b/test/fixtures/mail_handler/thunderbird_with_attachment_iso-8859-1.eml @@ -1,34 +1,34 @@ -Message-ID: <50AB9546.7020800@gmail.com> -Date: Tue, 20 Nov 2012 23:35:50 +0900 -From: John Smith -User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc13 Thunderbird/3.1.10 -MIME-Version: 1.0 -To: redmine@somenet.foo -Subject: test -Content-Type: multipart/mixed; - boundary="------------050902080306030406090208" - -This is a multi-part message in MIME format. ---------------050902080306030406090208 -Content-Type: text/plain; charset=ISO-8859-1; format=flowed -Content-Transfer-Encoding: 7bit - -test - ---------------050902080306030406090208 -Content-Type: image/png; - name="=?ISO-8859-1?Q?=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4?= - =?ISO-8859-1?Q?=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6?= - =?ISO-8859-1?Q?=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6?= - =?ISO-8859-1?Q?=DC=FC=C4=E4=D6=F6=DC=FC=2Epng?=" -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; - filename*0*=ISO-8859-1''%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6; - filename*1*=%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC; - filename*2*=%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4; - filename*3*=%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%2E%70%6E%67 - -iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAAAXNSR0IArs4c6QAAAAlwSFlz -AAALEwAACxMBAJqcGAAAAAd0SU1FB9wLFA4fJhRKIUQAAAAUSURBVAjXY/z//z8DEmBiQAWk -8gHq9gMHP8uZWAAAAABJRU5ErkJggg== ---------------050902080306030406090208-- +Message-ID: <50AB9546.7020800@gmail.com> +Date: Tue, 20 Nov 2012 23:35:50 +0900 +From: John Smith +User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110428 Fedora/3.1.10-1.fc13 Thunderbird/3.1.10 +MIME-Version: 1.0 +To: redmine@somenet.foo +Subject: test +Content-Type: multipart/mixed; + boundary="------------050902080306030406090208" + +This is a multi-part message in MIME format. +--------------050902080306030406090208 +Content-Type: text/plain; charset=ISO-8859-1; format=flowed +Content-Transfer-Encoding: 7bit + +test + +--------------050902080306030406090208 +Content-Type: image/png; + name="=?ISO-8859-1?Q?=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4?= + =?ISO-8859-1?Q?=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6?= + =?ISO-8859-1?Q?=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6=DC=FC=C4=E4=D6=F6?= + =?ISO-8859-1?Q?=DC=FC=C4=E4=D6=F6=DC=FC=2Epng?=" +Content-Transfer-Encoding: base64 +Content-Disposition: attachment; + filename*0*=ISO-8859-1''%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6; + filename*1*=%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC; + filename*2*=%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%C4%E4; + filename*3*=%D6%F6%DC%FC%C4%E4%D6%F6%DC%FC%2E%70%6E%67 + +iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAIAAAACDbGyAAAAAXNSR0IArs4c6QAAAAlwSFlz +AAALEwAACxMBAJqcGAAAAAd0SU1FB9wLFA4fJhRKIUQAAAAUSURBVAjXY/z//z8DEmBiQAWk +8gHq9gMHP8uZWAAAAABJRU5ErkJggg== +--------------050902080306030406090208-- diff --git a/test/fixtures/mail_handler/thunderbird_with_attachment_ja.eml b/test/fixtures/mail_handler/thunderbird_with_attachment_ja.eml index af7cbdf4c..88ba79f68 100644 --- a/test/fixtures/mail_handler/thunderbird_with_attachment_ja.eml +++ b/test/fixtures/mail_handler/thunderbird_with_attachment_ja.eml @@ -1,26 +1,26 @@ -Message-ID: <50AA00C6.4070108@gmail.com> -Date: Mon, 19 Nov 2012 18:49:58 +0900 -From: John Smith -User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Fedora/3.0.10-1.fc12 Lightning/1.0b1 Thunderbird/3.0.10 -MIME-Version: 1.0 -To: redmine@somenet.foo -Subject: test -Content-Type: multipart/mixed; - boundary="------------030104060902010800050907" - -This is a multi-part message in MIME format. ---------------030104060902010800050907 -Content-Type: text/plain; charset=ISO-2022-JP -Content-Transfer-Encoding: 7bit - -test - ---------------030104060902010800050907 -Content-Type: text/plain; - name="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?=" -Content-Transfer-Encoding: base64 -Content-Disposition: attachment; - filename*=ISO-2022-JP''%1B%24%42%25%46%25%39%25%48%1B%28%42%2E%74%78%74 - -dGVzdAo= ---------------030104060902010800050907-- +Message-ID: <50AA00C6.4070108@gmail.com> +Date: Mon, 19 Nov 2012 18:49:58 +0900 +From: John Smith +User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.15) Gecko/20101027 Fedora/3.0.10-1.fc12 Lightning/1.0b1 Thunderbird/3.0.10 +MIME-Version: 1.0 +To: redmine@somenet.foo +Subject: test +Content-Type: multipart/mixed; + boundary="------------030104060902010800050907" + +This is a multi-part message in MIME format. +--------------030104060902010800050907 +Content-Type: text/plain; charset=ISO-2022-JP +Content-Transfer-Encoding: 7bit + +test + +--------------030104060902010800050907 +Content-Type: text/plain; + name="=?ISO-2022-JP?B?GyRCJUYlOSVIGyhCLnR4dA==?=" +Content-Transfer-Encoding: base64 +Content-Disposition: attachment; + filename*=ISO-2022-JP''%1B%24%42%25%46%25%39%25%48%1B%28%42%2E%74%78%74 + +dGVzdAo= +--------------030104060902010800050907--