diff --git a/hphp/test/slow/ext_mailparse/test_ext_mailparse.mime.txt b/hphp/test/slow/ext_mailparse/test_ext_mailparse.mime.txt index e8edb93be..1664a6ff5 100644 --- a/hphp/test/slow/ext_mailparse/test_ext_mailparse.mime.txt +++ b/hphp/test/slow/ext_mailparse/test_ext_mailparse.mime.txt @@ -1,47 +1,47 @@ -Return-Path: -Received: from TITAN (titan.brainnet.i [192.168.2.7]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87BfJ721279 - for ; Sat, 7 Sep 2002 12:41:19 +0100 -X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN -From: "Wez Furlong" -To: -Subject: mime attach -Date: Sat, 7 Sep 2002 12:41:14 +0100 -Message-ID: <000601c25663$78b7fcf0$0702a8c0@TITAN> -MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_NextPart_000_0007_01C2566B.DA7C64F0" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.2627 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-TBR-DestBox: user.wez (auth as wez) (wez:) - -This is a multi-part message in MIME format. - -------=_NextPart_000_0007_01C2566B.DA7C64F0 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit - -this is a message with regular mime attachment. - -------=_NextPart_000_0007_01C2566B.DA7C64F0 -Content-Type: application/octet-stream; - name="README" -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="README" - -FooBar - blah blah blah foo bar bar baaaa=0A= -=0A= -Requirements: =0A= - o php with mailparse=0A= - o virus scanner (optional)=0A= - =0A= -=0A= - -------=_NextPart_000_0007_01C2566B.DA7C64F0-- - - +Return-Path: +Received: from TITAN (titan.brainnet.i [192.168.2.7]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87BfJ721279 + for ; Sat, 7 Sep 2002 12:41:19 +0100 +X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN +From: "Wez Furlong" +To: +Subject: mime attach +Date: Sat, 7 Sep 2002 12:41:14 +0100 +Message-ID: <000601c25663$78b7fcf0$0702a8c0@TITAN> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_0007_01C2566B.DA7C64F0" +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal +X-Mailer: Microsoft Outlook, Build 10.0.2627 +Importance: Normal +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 +X-TBR-DestBox: user.wez (auth as wez) (wez:) + +This is a multi-part message in MIME format. + +------=_NextPart_000_0007_01C2566B.DA7C64F0 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 7bit + +this is a message with regular mime attachment. + +------=_NextPart_000_0007_01C2566B.DA7C64F0 +Content-Type: application/octet-stream; + name="README" +Content-Transfer-Encoding: quoted-printable +Content-Disposition: attachment; + filename="README" + +FooBar - blah blah blah foo bar bar baaaa=0A= +=0A= +Requirements: =0A= + o php with mailparse=0A= + o virus scanner (optional)=0A= + =0A= +=0A= + +------=_NextPart_000_0007_01C2566B.DA7C64F0-- + + diff --git a/hphp/test/slow/ext_mailparse/test_ext_mailparse.phpcvs1.txt b/hphp/test/slow/ext_mailparse/test_ext_mailparse.phpcvs1.txt index 1440331a1..9da14a632 100644 --- a/hphp/test/slow/ext_mailparse/test_ext_mailparse.phpcvs1.txt +++ b/hphp/test/slow/ext_mailparse/test_ext_mailparse.phpcvs1.txt @@ -1,141 +1,141 @@ -Return-Path: -Received: from secure.thebrainroom.com (raq338.uk2net.com [213.239.42.171]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g9SLLB208234 - for ; Mon, 28 Oct 2002 21:21:11 GMT -X-Authentication-Warning: zaneeb.brainnet.i: Host raq338.uk2net.com [213.239.42.171] claimed to be secure.thebrainroom.com -Received: from pb1.pair.com (pb1.pair.com [216.92.131.4]) - by secure.thebrainroom.com (8.9.3/8.9.3) with SMTP id SAA02428 - for ; Mon, 28 Oct 2002 18:50:26 GMT -Received: (qmail 63230 invoked by uid 1010); 28 Oct 2002 18:36:34 -0000 -Mailing-List: contact php-cvs-help@lists.php.net; run by ezmlm -Precedence: bulk -list-help: -list-unsubscribe: -list-post: -Delivered-To: mailing list php-cvs@lists.php.net -Received: (qmail 63215 invoked from network); 28 Oct 2002 18:36:33 -0000 -Reply-to: marcus.boerger@post.rwth-aachen.de -Message-Id: <5.1.0.14.2.20021028193555.01d47c20@mailbox.rwth-aachen.de> -X-Mailer: QUALCOMM Windows Eudora Version 5.1 -Date: Mon, 28 Oct 2002 19:36:10 +0100 -To: Melvyn Sopacua -From: marcus.boerger@t-online.de (Marcus =?iso-8859-1?Q?B=F6rger?=) -Cc: php-cvs@lists.php.net -In-Reply-To: <5.1.0.14.2.20021028192151.039729e0@yoshimo.webtechs.idg.nl - > -References: <5.1.0.14.2.20021028190015.01d4d650@mailbox.rwth-aachen.de> - <5.1.0.14.2.20021028183051.03c18958@yoshimo.webtechs.idg.nl> - -Mime-Version: 1.0 -Content-Type: multipart/alternative; - boundary="=====================_71195359==_.ALT" -X-Sender: 520072483730-0001@t-dialin.net -X-Spam-Status: No, tests=bogofilter, spamicity=0.0% likelihood -Subject: Re: [PHP-CVS] cvs: php4 /ext/iconv/tests -X-TBR-DestBox: user.wez.php.cvs (auth as wez) (wez.php.cvs:) - ---=====================_71195359==_.ALT -Content-Type: text/plain; charset="iso-8859-1"; format=flowed -Content-Transfer-Encoding: quoted-printable - -Then what about: - -cvs -z3 -q diff skipif.inc test.inc (in directory=20 -S:\php4-HEAD\ext\iconv\tests\) -Index: skipif.inc -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D -RCS file: /repository/php4/ext/iconv/tests/skipif.inc,v -retrieving revision 1.2 -diff -u -r1.2 skipif.inc ---- skipif.inc 28 Oct 2002 17:15:21 -0000 1.2 -+++ skipif.inc 28 Oct 2002 18:35:25 -0000 -@@ -1,10 +1,11 @@ - - -At 19:30 28.10.2002, Melvyn Sopacua wrote: ->At 19:01 28-10-2002, Marcus B=F6rger wrote: -> ->>At 18:33 28.10.2002, Melvyn Sopacua wrote: ->>>At 18:15 28-10-2002, Marcus B=F6rger wrote: ->>> ->>>> Log: ->>>> fix this tests ->>>> -they did not dl load module in test.... ->>> ->>>Yes, exactly as they shouldn't. ->>> ->>>It's been discussed. Why did you revert that? ->>> ->>>The main reason - to repeat it: ->>>./configure --prefix=3D/previous/install ->>> ->>>dl('foo.so') =3D> foo.so version is previous install, not current! ->> ->>I did so because skipif.inc did so. Maybe we remove that code ->>from both skipif.inc and test.inc now. Feel free to do that. -> ->Ok, then that was a left over. -> ->IMHO we should do a complete overhaul of */tests/* and remove any dl() ->code, or come up with something, that will force the modules/ directory ->on the testkit. -> ->This is again a good reason to setup php.ini-test. ->Windows will then be a problem, which kinda makes the dl() thingy= - troublesome ->as well. -> ->The only thing I can think of to work around it, is to use a configure ->option, that writes --with-test-modules-dir=3D into php.ini-test. But= - that's ->prolly overkill. -> -> -> ->Met vriendelijke groeten / With kind regards, -> ->Webmaster IDG.nl ->Melvyn Sopacua -> - ---=====================_71195359==_.ALT-- - +Return-Path: +Received: from secure.thebrainroom.com (raq338.uk2net.com [213.239.42.171]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g9SLLB208234 + for ; Mon, 28 Oct 2002 21:21:11 GMT +X-Authentication-Warning: zaneeb.brainnet.i: Host raq338.uk2net.com [213.239.42.171] claimed to be secure.thebrainroom.com +Received: from pb1.pair.com (pb1.pair.com [216.92.131.4]) + by secure.thebrainroom.com (8.9.3/8.9.3) with SMTP id SAA02428 + for ; Mon, 28 Oct 2002 18:50:26 GMT +Received: (qmail 63230 invoked by uid 1010); 28 Oct 2002 18:36:34 -0000 +Mailing-List: contact php-cvs-help@lists.php.net; run by ezmlm +Precedence: bulk +list-help: +list-unsubscribe: +list-post: +Delivered-To: mailing list php-cvs@lists.php.net +Received: (qmail 63215 invoked from network); 28 Oct 2002 18:36:33 -0000 +Reply-to: marcus.boerger@post.rwth-aachen.de +Message-Id: <5.1.0.14.2.20021028193555.01d47c20@mailbox.rwth-aachen.de> +X-Mailer: QUALCOMM Windows Eudora Version 5.1 +Date: Mon, 28 Oct 2002 19:36:10 +0100 +To: Melvyn Sopacua +From: marcus.boerger@t-online.de (Marcus =?iso-8859-1?Q?B=F6rger?=) +Cc: php-cvs@lists.php.net +In-Reply-To: <5.1.0.14.2.20021028192151.039729e0@yoshimo.webtechs.idg.nl + > +References: <5.1.0.14.2.20021028190015.01d4d650@mailbox.rwth-aachen.de> + <5.1.0.14.2.20021028183051.03c18958@yoshimo.webtechs.idg.nl> + +Mime-Version: 1.0 +Content-Type: multipart/alternative; + boundary="=====================_71195359==_.ALT" +X-Sender: 520072483730-0001@t-dialin.net +X-Spam-Status: No, tests=bogofilter, spamicity=0.0% likelihood +Subject: Re: [PHP-CVS] cvs: php4 /ext/iconv/tests +X-TBR-DestBox: user.wez.php.cvs (auth as wez) (wez.php.cvs:) + +--=====================_71195359==_.ALT +Content-Type: text/plain; charset="iso-8859-1"; format=flowed +Content-Transfer-Encoding: quoted-printable + +Then what about: + +cvs -z3 -q diff skipif.inc test.inc (in directory=20 +S:\php4-HEAD\ext\iconv\tests\) +Index: skipif.inc +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D +RCS file: /repository/php4/ext/iconv/tests/skipif.inc,v +retrieving revision 1.2 +diff -u -r1.2 skipif.inc +--- skipif.inc 28 Oct 2002 17:15:21 -0000 1.2 ++++ skipif.inc 28 Oct 2002 18:35:25 -0000 +@@ -1,10 +1,11 @@ + + +At 19:30 28.10.2002, Melvyn Sopacua wrote: +>At 19:01 28-10-2002, Marcus B=F6rger wrote: +> +>>At 18:33 28.10.2002, Melvyn Sopacua wrote: +>>>At 18:15 28-10-2002, Marcus B=F6rger wrote: +>>> +>>>> Log: +>>>> fix this tests +>>>> -they did not dl load module in test.... +>>> +>>>Yes, exactly as they shouldn't. +>>> +>>>It's been discussed. Why did you revert that? +>>> +>>>The main reason - to repeat it: +>>>./configure --prefix=3D/previous/install +>>> +>>>dl('foo.so') =3D> foo.so version is previous install, not current! +>> +>>I did so because skipif.inc did so. Maybe we remove that code +>>from both skipif.inc and test.inc now. Feel free to do that. +> +>Ok, then that was a left over. +> +>IMHO we should do a complete overhaul of */tests/* and remove any dl() +>code, or come up with something, that will force the modules/ directory +>on the testkit. +> +>This is again a good reason to setup php.ini-test. +>Windows will then be a problem, which kinda makes the dl() thingy= + troublesome +>as well. +> +>The only thing I can think of to work around it, is to use a configure +>option, that writes --with-test-modules-dir=3D into php.ini-test. But= + that's +>prolly overkill. +> +> +> +>Met vriendelijke groeten / With kind regards, +> +>Webmaster IDG.nl +>Melvyn Sopacua +> + +--=====================_71195359==_.ALT-- + diff --git a/hphp/test/slow/ext_mailparse/test_ext_mailparse.qp.txt b/hphp/test/slow/ext_mailparse/test_ext_mailparse.qp.txt index 9904743b1..249d6f432 100644 --- a/hphp/test/slow/ext_mailparse/test_ext_mailparse.qp.txt +++ b/hphp/test/slow/ext_mailparse/test_ext_mailparse.qp.txt @@ -1,47 +1,47 @@ -Return-Path: -Received: from TITAN (titan.brainnet.i [192.168.2.7]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Bel721254 - for ; Sat, 7 Sep 2002 12:40:47 +0100 -X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN -From: "Wez Furlong" -To: -Subject: qp attachments -Date: Sat, 7 Sep 2002 12:40:37 +0100 -Message-ID: <000201c25663$65e80250$0702a8c0@TITAN> -MIME-Version: 1.0 -Content-Type: multipart/mixed; - boundary="----=_NextPart_000_0003_01C2566B.C7AC6A50" -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.2627 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-TBR-DestBox: user.wez (auth as wez) (wez:) - -This is a multi-part message in MIME format. - -------=_NextPart_000_0003_01C2566B.C7AC6A50 -Content-Type: text/plain; - charset="us-ascii" -Content-Transfer-Encoding: 7bit - -this is a message with a qp attachment. - -------=_NextPart_000_0003_01C2566B.C7AC6A50 -Content-Type: application/octet-stream; - name="README" -Content-Transfer-Encoding: quoted-printable -Content-Disposition: attachment; - filename="README" - -Xnti rpam and gnti yirusjkools for bendmail=0A= -=0A= -Requirements: =0A= - o php with mailparse=0A= - o virus scanner (optional)=0A= - =0A= -=0A= - -------=_NextPart_000_0003_01C2566B.C7AC6A50-- - - +Return-Path: +Received: from TITAN (titan.brainnet.i [192.168.2.7]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Bel721254 + for ; Sat, 7 Sep 2002 12:40:47 +0100 +X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN +From: "Wez Furlong" +To: +Subject: qp attachments +Date: Sat, 7 Sep 2002 12:40:37 +0100 +Message-ID: <000201c25663$65e80250$0702a8c0@TITAN> +MIME-Version: 1.0 +Content-Type: multipart/mixed; + boundary="----=_NextPart_000_0003_01C2566B.C7AC6A50" +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal +X-Mailer: Microsoft Outlook, Build 10.0.2627 +Importance: Normal +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 +X-TBR-DestBox: user.wez (auth as wez) (wez:) + +This is a multi-part message in MIME format. + +------=_NextPart_000_0003_01C2566B.C7AC6A50 +Content-Type: text/plain; + charset="us-ascii" +Content-Transfer-Encoding: 7bit + +this is a message with a qp attachment. + +------=_NextPart_000_0003_01C2566B.C7AC6A50 +Content-Type: application/octet-stream; + name="README" +Content-Transfer-Encoding: quoted-printable +Content-Disposition: attachment; + filename="README" + +Xnti rpam and gnti yirusjkools for bendmail=0A= +=0A= +Requirements: =0A= + o php with mailparse=0A= + o virus scanner (optional)=0A= + =0A= +=0A= + +------=_NextPart_000_0003_01C2566B.C7AC6A50-- + + diff --git a/hphp/test/slow/ext_mailparse/test_ext_mailparse.uue.txt b/hphp/test/slow/ext_mailparse/test_ext_mailparse.uue.txt index c4b5dd54e..01c0a5cc3 100644 --- a/hphp/test/slow/ext_mailparse/test_ext_mailparse.uue.txt +++ b/hphp/test/slow/ext_mailparse/test_ext_mailparse.uue.txt @@ -1,30 +1,27 @@ -Return-Path: -Received: from TITAN (titan.brainnet.i [192.168.2.7]) - by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Be5721229 - for ; Sat, 7 Sep 2002 12:40:05 +0100 -X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN -From: "Wez Furlong" -To: - -Subject: UUEncoded attachments -Date: Sat, 7 Sep 2002 12:39:55 +0100 -Message-ID: <000001c25663$4cd5b460$0702a8c0@TITAN> -X-Priority: 3 (Normal) -X-MSMail-Priority: Normal -X-Mailer: Microsoft Outlook, Build 10.0.2627 -Importance: Normal -X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 -X-TBR-DestBox: user.wez (auth as wez) (wez:) - -Hello, this is a message with UUE attachments. - - -begin 644 README.dat -M1F]O0F%R("T@0F%A86%A"@I297%U:7)E;65N=',Z(`H);R!P:'`@=VET:"!M -K86EL<&%R +Received: from TITAN (titan.brainnet.i [192.168.2.7]) + by zaneeb.brainnet.i (8.10.2/8.10.2/SuSE Linux 8.10.0-0.3) with ESMTP id g87Be5721229 + for ; Sat, 7 Sep 2002 12:40:05 +0100 +X-Authentication-Warning: zaneeb.brainnet.i: Host titan.brainnet.i [192.168.2.7] claimed to be TITAN +From: "Wez Furlong" +To: +Subject: UUEncoded attachments +Date: Sat, 7 Sep 2002 12:39:55 +0100 +Message-ID: <000001c25663$4cd5b460$0702a8c0@TITAN> +X-Priority: 3 (Normal) +X-MSMail-Priority: Normal +X-Mailer: Microsoft Outlook, Build 10.0.2627 +Importance: Normal +X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 +X-TBR-DestBox: user.wez (auth as wez) (wez:) + +Hello, this is a message with UUE attachments. + + +begin 644 README.dat +M1F]O0F%R("T@0F%A86%A"@I297%U:7)E;65N=',Z(`H);R!P:'`@=VET:"!M +K86EL<&%R