X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/afda344b580b54a4513569720aec3260cd5ba546..2c3ac6dd18dbf1f048a7054a85879dbf90c1e7f4:/test/mail/4000.userx?ds=inline diff --git a/test/mail/4000.userx b/test/mail/4000.userx index 65ac8a331..99f71010c 100644 --- a/test/mail/4000.userx +++ b/test/mail/4000.userx @@ -2,72 +2,9 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaY-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-Router-SSint: was preserved - -A message without any headers. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmaZ-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: Test person -To: Me -Subject: A real test message -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-ID: <41C2F849.3060203@projectile.test.ex> -Sender: CALLER_NAME -X-Router-SSint: was preserved - -OK, this should look like a genuine message. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbA-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: 99Junk99@somewhere.com -To: -Subject: MAKE MONEY FAST!!!! -Message-id: abcde -Sender: CALLER_NAME -Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-Router-SSint: was preserved - -This should be enough to trip the threshold. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbB-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: Test person -To: Me -Subject: A real test message -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeReject: test fakereject -Sender: CALLER_NAME -X-Regex: Regex matched -X-Router-SSint: was preserved - -OK, this should look like a genuine message, but -it will trip on THIS REGEX. - -From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER (helo=test.ex) - by myhost.test.ex with local-esmtp (Exim x.yz) - (envelope-from ) - id 10HmbC-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + id 10HmaY-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 From: J Caesar To: a-list00@exim.org @@ -92,48 +29,70 @@ X-0-content-description: X-0-is-multipart: 1 X-0-is-coverletter: 1 X-0-is-rfc822: 0 -X-0-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00000 -X-0-content-size: 1 +X-0-decode-filename: TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000-00000 +X-0-content-size: 2 X-1-content-type: text/plain X-1-filename: -X-1-charset: us-ascii +X-1-charset: US-ASCII X-1-boundary: X-1-content-disposition: inline -X-1-content-transfer-encoding: +X-1-content-transfer-encoding: quoted-printable X-1-content-id: X-1-content-description: X-1-is-multipart: 0 X-1-is-coverletter: 1 X-1-is-rfc822: 0 -X-1-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00001 +X-1-decode-filename: TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000-00001 X-1-content-size: 1 X-2-content-type: text/plain -X-2-filename: working-patch +X-2-filename: X-2-charset: us-ascii X-2-boundary: -X-2-content-disposition: attachment +X-2-content-disposition: inline X-2-content-transfer-encoding: X-2-content-id: X-2-content-description: X-2-is-multipart: 0 X-2-is-coverletter: 0 X-2-is-rfc822: 0 -X-2-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00002 +X-2-decode-filename: TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000-00002 X-2-content-size: 1 X-3-content-type: text/plain -X-3-filename: +X-3-filename: working-patch X-3-charset: us-ascii X-3-boundary: -X-3-content-disposition: inline -X-3-content-transfer-encoding: 7bit +X-3-content-disposition: attachment +X-3-content-transfer-encoding: X-3-content-id: X-3-content-description: X-3-is-multipart: 0 X-3-is-coverletter: 0 X-3-is-rfc822: 0 -X-3-decode-filename: TESTSUITE/spool/scan/10HmbC-0005vi-00/10HmbC-0005vi-00-00003 +X-3-decode-filename: TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000-00003 X-3-content-size: 1 -X-Router-SSint: was preserved +X-4-content-type: text/plain +X-4-filename: +X-4-charset: us-ascii +X-4-boundary: +X-4-content-disposition: inline +X-4-content-transfer-encoding: 7bit +X-4-content-id: +X-4-content-description: +X-4-is-multipart: 0 +X-4-is-coverletter: 0 +X-4-is-rfc822: 0 +X-4-decode-filename: TESTSUITE/spool/scan/10HmaY-000000005vi-0000/10HmaY-000000005vi-0000-00004 +X-4-content-size: 1 + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset=US-ASCII +Content-Transfer-Encoding: quoted-printable +Content-Disposition: inline + +Test quoted-printable =3D +Space at end of line=40 +Continued line = +with this text. --T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii @@ -174,63 +133,214 @@ Content-Disposition: inline --T4sUOijqQbZv57TR-- From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbD-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -Message-Id: -From: CALLER_NAME + id 10HmaZ-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Date: Tue, 2 Mar 1999 09:44:33 +0000 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3058@test.ex> +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +Content-Disposition: inline +Subject: Nasty +Sender: CALLER_NAME +X-0-content-type: multipart/mixed +X-0-filename: +X-0-charset: +X-0-boundary: T4sUOijqQbZv57TR +X-0-content-disposition: inline +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 1 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000-00000 +X-0-content-size: 1 +X-1-content-type: text/plain +X-1-filename: +X-1-charset: +X-1-boundary: +X-1-content-disposition: +X-1-content-transfer-encoding: +X-1-content-id: +X-1-content-description: +X-1-is-multipart: 0 +X-1-is-coverletter: 1 +X-1-is-rfc822: 0 +X-1-decode-filename: TESTSUITE/spool/scan/10HmaZ-000000005vi-0000/10HmaZ-000000005vi-0000-00001 +X-1-content-size: 1 + +--T4sUOijqQbZv57TR +Content-Type: text/plain; charset= + +foobar + +--T4sUOijqQbZv57TR-- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbA-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 -X-Router-SSint: was preserved +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3059@test.ex> +Mime-Version: 1.0 +Content-Type: text/html; + charset=UTF-8; + name="" +Content-Disposition: inline +Subject: Nasty +Sender: CALLER_NAME +X-0-content-type: text/html +X-0-filename: +X-0-charset: UTF-8 +X-0-boundary: +X-0-content-disposition: inline +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 0 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbA-000000005vi-0000/10HmbA-000000005vi-0000-00000 +X-0-content-size: 1 -A message without any headers. +--T4sUOijqQbZv57TR +Content-Type: text/plain; + +foobar + +--T4sUOijqQbZv57TR-- From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 -Received: from CALLER by myhost.test.ex with local (Exim x.yz) +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbE-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + id 10HmbB-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 Date: Tue, 2 Mar 1999 09:44:33 +0000 From: J Caesar To: a-list00@exim.org -Message-ID: <20041217133501.GA3058@test.ex> +Message-ID: <20041217133501.GA3059@test.ex> Mime-Version: 1.0 -Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +Content-Type: text/plain; charset="utf-8"" Content-Disposition: inline -Subject: [exim] Re: Bug#286074: eximstats: uses message count as data for - the "volume" charts -X-BeenThere: a-list00@exim.org -X-Mailman-Version: 2.1.5 -Precedence: list +Subject: Nasty3 Sender: CALLER_NAME +X-0-content-type: text/plain +X-0-filename: +X-0-charset: utf-8; +X-0-boundary: +X-0-content-disposition: inline +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 0 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbB-000000005vi-0000/10HmbB-000000005vi-0000-00000 +X-0-content-size: 1 + +--T4sUOijqQbZv57TR +Content-Type: text/plain; + +foobar + +--T4sUOijqQbZv57TR-- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbC-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Date: Tue, 2 Mar 1999 09:44:33 +0000 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133501.GA3059@test.ex> +Mime-Version: 1.0 +Content-Type: text/plain; + garbage1; + garbage2=foo; + garbage3="bar"foo; + charset=UTF-8; + garbage4="; +Content-Disposition: inline +Subject: Nasty4 +Sender: CALLER_NAME +X-0-content-type: text/plain +X-0-filename: +X-0-charset: UTF-8 +X-0-boundary: +X-0-content-disposition: inline +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 0 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbC-000000005vi-0000/10HmbC-000000005vi-0000-00000 +X-0-content-size: 1 + +--T4sUOijqQbZv57TR +Content-Type: text/plain; + +foobar + +--T4sUOijqQbZv57TR-- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbD-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Date: Tue, 2 Mar 1999 09:44:33 +0000 +Message-ID: <20041217133501.GA3058@test.ex> +Subject: Nasty5 +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="T4sUOijqQbZv57TR" +From: CALLER_NAME X-0-content-type: multipart/mixed X-0-filename: X-0-charset: X-0-boundary: T4sUOijqQbZv57TR -X-0-content-disposition: inline +X-0-content-disposition: X-0-content-transfer-encoding: X-0-content-id: X-0-content-description: X-0-is-multipart: 1 X-0-is-coverletter: 1 X-0-is-rfc822: 0 -X-0-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00000 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbD-000000005vi-0000/10HmbD-000000005vi-0000-00000 X-0-content-size: 1 X-1-content-type: text/plain -X-1-filename: +X-1-filename: test ä test1 X-1-charset: us-ascii X-1-boundary: -X-1-content-disposition: inline +X-1-content-disposition: attachment X-1-content-transfer-encoding: X-1-content-id: X-1-content-description: X-1-is-multipart: 0 X-1-is-coverletter: 1 X-1-is-rfc822: 0 -X-1-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00001 +X-1-decode-filename: TESTSUITE/spool/scan/10HmbD-000000005vi-0000/10HmbD-000000005vi-0000-00001 X-1-content-size: 1 X-2-content-type: text/plain -X-2-filename: working-patch +X-2-filename: test ä test2 X-2-charset: us-ascii X-2-boundary: X-2-content-disposition: attachment @@ -240,58 +350,59 @@ X-2-content-description: X-2-is-multipart: 0 X-2-is-coverletter: 0 X-2-is-rfc822: 0 -X-2-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00002 +X-2-decode-filename: TESTSUITE/spool/scan/10HmbD-000000005vi-0000/10HmbD-000000005vi-0000-00002 X-2-content-size: 1 -X-3-content-type: text/plain -X-3-filename: -X-3-charset: us-ascii -X-3-boundary: -X-3-content-disposition: inline -X-3-content-transfer-encoding: 7bit -X-3-content-id: -X-3-content-description: -X-3-is-multipart: 0 -X-3-is-coverletter: 0 -X-3-is-rfc822: 0 -X-3-decode-filename: TESTSUITE/spool/scan/10HmbE-0005vi-00/10HmbE-0005vi-00-00003 -X-3-content-size: 1 -X-Router-SSint: was preserved --T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii -Content-Disposition: inline +Content-Disposition: attachment; filename="=?iso-8859-1?Q?test_=E4_test1?=" -There was a part of the patch missing, complete one is attached. - sorry for wasting your time +(content 1: filename is rfc2047 encoded) --T4sUOijqQbZv57TR Content-Type: text/plain; charset=us-ascii -Content-Disposition: attachment; filename=working-patch +Content-Disposition: attachment; filename*=ISO-8859-1''%74%65%73%74%20%E4%20%74%65%73%74%32 ---- /usr/sbin/eximstats 2004-12-17 13:36:44.381983753 +0100 -+++ eximstats 2004-12-17 13:47:37.763185260 +0100 -@@ -1107,11 +1107,11 @@ - if (scalar @chartdatanames < $ntopchart) - { - push(@chartdatanames, $key); -- push(@chartdatavals, $$m_count{$key}); -+ push(@chartdatavals, $$m_data{$key}); - } - else - { -- $chartotherval += $$m_count{$key}; -+ $chartotherval += $$m_data{$key}; - } - } - push(@chartdatanames, "Other"); +(content 2: filename is rfc2231 encoded) + +--T4sUOijqQbZv57TR-- + +From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 +Received: from CALLER (helo=test.ex) + by myhost.test.ex with local-esmtp (Exim x.yz) + (envelope-from ) + id 10HmbE-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +Date: Tue, 2 Mar 1999 09:44:33 +0000 +From: J Caesar +To: a-list00@exim.org +Message-ID: <20041217133502.GA3059@test.ex> +Mime-Version: 1.0 +Content-Type: application/pdf; + name*=''2015.11.13%20-%20Pr%C3%A4sentation%20GI%20-%20LK.PDF +Content-Disposition: attachment; + filename*=''2015.11.13%20-%20Pr%C3%A4sentation%20GI%20-%20LK.PDF +Subject: Nasty6 +Sender: CALLER_NAME +X-0-content-type: application/pdf +X-0-filename: 2015.11.13 - Präsentation GI - LK.PDF +X-0-charset: +X-0-boundary: +X-0-content-disposition: attachment +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 0 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbE-000000005vi-0000/10HmbE-000000005vi-0000-00000 +X-0-content-size: 1 --T4sUOijqQbZv57TR -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Content-Disposition: inline +Content-Type: text/plain; --- +foobar --T4sUOijqQbZv57TR-- @@ -299,18 +410,91 @@ From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999 Received: from CALLER (helo=test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbF-0005vi-00 - for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -From: Test person -To: Me -Subject: A real test message -Date: Tue, 2 Mar 1999 09:44:33 +0000 -Message-ID: <41C2F849.3060203@projectile.test.ex> -FakeDefer: test fakedefer + id 10HmbF-000000005vi-0000 + for userx@test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 +From: localpart@test.example +To: localpart@test.example +Subject: Bug 3099 (2) +MIME-Version: 1.0 +Content-Type: multipart/mixed; boundary="----=_MIME_BOUNDARY_000_695039" +Message-Id: Sender: CALLER_NAME -X-Regex: Regex matched -X-Router-SSint: was preserved +Date: Tue, 2 Mar 1999 09:44:33 +0000 +X-0-content-type: multipart/mixed +X-0-filename: +X-0-charset: +X-0-boundary: ----=_MIME_BOUNDARY_000_695039 +X-0-content-disposition: +X-0-content-transfer-encoding: +X-0-content-id: +X-0-content-description: +X-0-is-multipart: 1 +X-0-is-coverletter: 1 +X-0-is-rfc822: 0 +X-0-decode-filename: TESTSUITE/spool/scan/10HmbF-000000005vi-0000/10HmbF-000000005vi-0000-00000 +X-0-content-size: 1 +X-1-content-type: text/plain +X-1-filename: +X-1-charset: +X-1-boundary: +X-1-content-disposition: +X-1-content-transfer-encoding: +X-1-content-id: +X-1-content-description: +X-1-is-multipart: 0 +X-1-is-coverletter: 1 +X-1-is-rfc822: 0 +X-1-decode-filename: TESTSUITE/spool/scan/10HmbF-000000005vi-0000/10HmbF-000000005vi-0000-00001 +X-1-content-size: 1 +X-2-content-type: application/octet-stream +X-2-filename: example3.exe +X-2-charset: +X-2-boundary: +X-2-content-disposition: attachment +X-2-content-transfer-encoding: base64 +X-2-content-id: +X-2-content-description: +X-2-is-multipart: 0 +X-2-is-coverletter: 0 +X-2-is-rfc822: 0 +X-2-decode-filename: TESTSUITE/spool/scan/10HmbF-000000005vi-0000/10HmbF-000000005vi-0000-00002 +X-2-content-size: 1 +X-3-content-type: application/octet-stream +X-3-filename: example4.txt +X-3-charset: +X-3-boundary: +X-3-content-disposition: attachment +X-3-content-transfer-encoding: base64 +X-3-content-id: +X-3-content-description: +X-3-is-multipart: 0 +X-3-is-coverletter: 0 +X-3-is-rfc822: 0 +X-3-decode-filename: TESTSUITE/spool/scan/10HmbF-000000005vi-0000/10HmbF-000000005vi-0000-00003 +X-3-content-size: 1 + +------=_MIME_BOUNDARY_000_695039 +Content-Type: text/plain + +This is a test mailing +------=_MIME_BOUNDARY_000_695039 +Content-Type: application/octet-stream +Content-Disposition: attachment; + filename*0*="example3"; + filename*1*=".exe" +Content-Transfer-Encoding: BASE64 + +QmVpc3BpZWwK + +------=_MIME_BOUNDARY_000_695039 +Content-Type: application/octet-stream +Content-Disposition: attachment; + name*0="example4"; + name*1=".txt" +Content-Transfer-Encoding: BASE64 + +QmVpc3BpZWwK -OK, this should look like a genuine message, but -it will trip on THIS REGEX. +------=_MIME_BOUNDARY_000_695039--