[popfile-commit] engine/tests TestMailParse.tst,1.6,1.7 TestMailParse003.cam,1.4,1.5 TestMailParse003.wrd,1.2,1.3 TestMailParse005.wrd,1.1,1.2 TestMailParse007.wrd,1.3,1.4 TestMailParse008.wrd,1.1,1.2 TestMailParse009.wrd,1.4,1.5 TestMailParse010.cam,1.4,1.5 TestMailParse010.wrd,1.2,1.3 TestMailParse011.cam,1.4,1.5 TestMailParse011.msg,1.3,1.4 TestMailParse012.wrd,1.1,1.2 TestMailParse013.cam,1.4,1.5 TestMailParse013.msg,1.1,1.2 TestMailParse013.wrd,1.2,1.3 TestMailParse015.wrd,1.3,1.4 TestMailParse017.wrd,1.1,1.2 TestMailParse019.wrd,1.2,1.3 TestMailParse020.wrd,1.1,1.2 TestMailParse021.msg,1.1,1.2

[<jgr...@us...>]

Update of /cvsroot/popfile/engine/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv17829/tests

Modified Files:
	TestMailParse.tst TestMailParse003.cam TestMailParse003.wrd 
	TestMailParse005.wrd TestMailParse007.wrd TestMailParse008.wrd 
	TestMailParse009.wrd TestMailParse010.cam TestMailParse010.wrd 
	TestMailParse011.cam TestMailParse011.msg TestMailParse012.wrd 
	TestMailParse013.cam TestMailParse013.msg TestMailParse013.wrd 
	TestMailParse015.wrd TestMailParse017.wrd TestMailParse019.wrd 
	TestMailParse020.wrd TestMailParse021.msg 
Log Message:
Restored test suite to working order and fix bug where wrong Date header was being picked up in quarantined headers; all tests now pass

Index: TestMailParse.tst
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse.tst,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestMailParse.tst	29 Mar 2003 00:26:55 -0000	1.6
--- TestMailParse.tst	26 Jun 2003 14:09:00 -0000	1.7
***************
*** 24,29 ****
  
  # Check line splitting into words
! $cl->{htmlbackcolor} = $cl->map_color( 'white' );
! $cl->{htmlfontcolor} = $cl->map_color( 'black' );
  $cl->{words__}       = {};
  $cl->add_line( 'this is a test of,adding words: from a line of text!', 0, '' );
--- 24,29 ----
  
  # Check line splitting into words
! $cl->{htmlbackcolor__} = $cl->map_color( 'white' );
! $cl->{htmlfontcolor__} = $cl->map_color( 'black' );
  $cl->{words__}       = {};
  $cl->add_line( 'this is a test of,adding words: from a line of text!', 0, '' );
***************
*** 62,66 ****
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'red' ) );
  $cl->{htmlfontcolor__} = '';
! test_assert_equal( $cl->parse_html( '<font color=#00ff00>' ), 0 );
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'green' ) );
  $cl->{htmlfontcolor__} = '';
--- 62,66 ----
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'red' ) );
  $cl->{htmlfontcolor__} = '';
! test_assert_equal( $cl->parse_html( '<font color=#008000>' ), 0 );
  test_assert_equal( $cl->{htmlfontcolor__}, $cl->map_color( 'green' ) );
  $cl->{htmlfontcolor__} = '';
***************
*** 130,145 ****
  # Check that from, to and subject get set correctly when parsing a message
  $cl->parse_stream( 'tests/TestMailParse013.msg' );
! test_assert_equal( $cl->{from},    'RN <rr...@nn...>'                        );
! test_assert_equal( $cl->{to},      '"Armlet Forum" <arm...@ne...>' );
! test_assert_equal( $cl->{subject}, '(Archive Copy) RE: CW v9 and armlets...'       );
  $cl->parse_stream( 'tests/TestMailParse018.msg' );
! $cl->{to} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  $cl->parse_stream( 'tests/TestMailParse019.msg' );
! $cl->{to} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  
  # Check that multi-line To: and CC: headers get handled properly
  $cl->parse_stream( 'tests/TestMailParse021.msg' );
! test_assert_equal( $cl->{to},      'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., <ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>, <ds...@cr...>, <ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, <ds...@da...>' );
! test_assert_equal( $cl->{cc},      'ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., <ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, <ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, <ds...@dc...>, <ds...@da...>' );
--- 130,148 ----
  # Check that from, to and subject get set correctly when parsing a message
  $cl->parse_stream( 'tests/TestMailParse013.msg' );
! test_assert_equal( $cl->{from__},    'RN <rr...@nn...>'                        );
! test_assert_equal( $cl->{to__},      '"Armlet Forum" <arm...@ne...>' );
! test_assert_equal( $cl->{subject__}, '(Archive Copy) RE: CW v9 and armlets...'       );
  $cl->parse_stream( 'tests/TestMailParse018.msg' );
! $cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  $cl->parse_stream( 'tests/TestMailParse019.msg' );
! $cl->{to__} =~ /(\Qbugtracker\E@\Qrelativity.com\E)/;
  test_assert_equal( $1, 'bug...@re...' );
  
  # Check that multi-line To: and CC: headers get handled properly
  $cl->parse_stream( 'tests/TestMailParse021.msg' );
! $cl->{to__} =~ s/[\r\n]//g;
! test_assert_equal( $cl->{to__},      'ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., 	<ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>	, <ds...@cr...>, 	<ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, 	<ds...@da...>' );
! $cl->{cc__} =~ s/[\r\n]//g;
! test_assert_equal( $cl->{cc__},      'ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., 	<ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, 	<ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, 	<ds...@dc...>, <ds...@da...>' );
! 

Index: TestMailParse003.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse003.cam	16 Apr 2003 01:26:45 -0000	1.4
--- TestMailParse003.cam	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 13,21 ****
  Content-Transfer-Encoding: 7bit
  Return-Path: j23...@ea...
! X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC)
! FILETIME=[A257A580:01C2BA9D]
  --=gs6mlah1knva3tk5nbs4422k3570q7m3k==
  Content-Transfer-Encoding: base64
  Content-Type: text/html; charset="US-ASCII"
  PGh0bWw+DQo8YSBocmVmPSJodHRwOi8vJTc3JTc3dy5wJTYxJTczJTczNCU2NiU3MmUlNjUlMkVuZXQvcGIzLyIgVDhJPjxGT05UIFNJWkU9NT48Qj4mIzg3
  OyYjOTc7PCFLND50PCE0YTQ1PmMmIzEwNDs8IVBKMHV1PiAmIzY4OzwhT1UxMGRRPm88IWgzMj5nPCFOWDc4PnM8IUY0NzZ0PiAmIzExNTsmIzEwODs8IXkw
--- 13,24 ----
  Content-Transfer-Encoding: 7bit
  Return-Path: j23...@ea...
! X-OriginalArrivalTime: 13 Jan 2003 00:49:31.0608 (UTC) FILETIME=[A257A580:01C2BA9D]
! X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
! 
  --=gs6mlah1knva3tk5nbs4422k3570q7m3k==
  Content-Transfer-Encoding: base64
  Content-Type: text/html; charset="US-ASCII"
+ 
  PGh0bWw+DQo8YSBocmVmPSJodHRwOi8vJTc3JTc3dy5wJTYxJTczJTczNCU2NiU3MmUlNjUlMkVuZXQvcGIzLyIgVDhJPjxGT05UIFNJWkU9NT48Qj4mIzg3
  OyYjOTc7PCFLND50PCE0YTQ1PmMmIzEwNDs8IVBKMHV1PiAmIzY4OzwhT1UxMGRRPm88IWgzMj5nPCFOWDc4PnM8IUY0NzZ0PiAmIzExNTsmIzEwODs8IXkw
***************
*** 30,34 ****
  ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
  --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
! X-Text-Classification: spam
! X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
  
--- 33,36 ----
  ayBIZXJlPC9hPjxCUj4NCjxCUj48L2h0bWw+DQoNCmFQcTgyTU9kICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjTUo=
  --=gs6mlah1knva3tk5nbs4422k3570q7m3k==--
! 
  

Index: TestMailParse003.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse003.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse003.wrd	24 Jan 2003 23:18:44 -0000	1.2
--- TestMailParse003.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 16,20 ****
  encoding:base64 1
  earthlink.net 2
! html:encodedurl 22
  girls 1
  click 2
--- 16,20 ----
  encoding:base64 1
  earthlink.net 2
! html:encodedurl 3
  girls 1
  click 2

Index: TestMailParse005.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse005.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse005.wrd	20 Jan 2003 20:11:58 -0000	1.1
--- TestMailParse005.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 16,20 ****
  san 1
  diego 1
- trick:dottedwords 1
  bit 1
  webcam 3
--- 16,19 ----
***************
*** 23,27 ****
  xos...@ho... 2
  ano...@ns... 1
- psremember 1
  www.freelivecamgirls.net 2
  yah 1
--- 22,25 ----
***************
*** 37,41 ****
  live 2
  don't 1
! remember 1
  co.kr 1
  monday 1
--- 35,39 ----
  live 2
  don't 1
! remember 2
  co.kr 1
  monday 1

Index: TestMailParse007.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse007.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse007.wrd	24 Jan 2003 23:18:44 -0000	1.3
--- TestMailParse007.wrd	26 Jun 2003 14:09:00 -0000	1.4
***************
*** 159,163 ****
  lose 1
  put 1
! mail126.ninodw.com 1
  regularly 1
  seems 1
--- 159,163 ----
  lose 1
  put 1
! mail126.ninodw.com 2
  regularly 1
  seems 1
***************
*** 228,232 ****
  gryhfcynarg 1
  now 4
! ninodw.com 1
  subject:girls 1
  fuckin 1
--- 228,232 ----
  gryhfcynarg 1
  now 4
! ninodw.com 2
  subject:girls 1
  fuckin 1

Index: TestMailParse008.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse008.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse008.wrd	20 Jan 2003 20:11:59 -0000	1.1
--- TestMailParse008.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 3,7 ****
  join 2
  group 1
! telusplanet.net 1
  what's 1
  from:alice 1
--- 3,7 ----
  join 2
  group 1
! telusplanet.net 3
  what's 1
  from:alice 1
***************
*** 42,46 ****
  just 2
  tell 1
! priv-edtnes27.telusplanet.net 1
  from:yahu.com 1
  friends 1
--- 42,46 ----
  just 2
  tell 1
! priv-edtnes27.telusplanet.net 2
  from:yahu.com 1
  friends 1

Index: TestMailParse009.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse009.wrd,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse009.wrd	25 Feb 2003 02:04:13 -0000	1.4
--- TestMailParse009.wrd	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 17,21 ****
  encoding:7bit 1
  poetic.com 2
! white 3
  from:poetic.com 1
  200.204.91.79 2
--- 17,21 ----
  encoding:7bit 1
  poetic.com 2
! white 2
  from:poetic.com 1
  200.204.91.79 2
***************
*** 23,25 ****
  subject:comman 1
  28...@28... 1
- 202.108.221.16 4
--- 23,24 ----

Index: TestMailParse010.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5

Index: TestMailParse010.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse010.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse010.wrd	27 Feb 2003 09:49:38 -0000	1.2
--- TestMailParse010.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 2,9 ****
  rm_...@ma... 1
  authenticated 2
! myrealbox.com 1
  subject:activation 1
  less 1
- further 1
  membership 1
  adult 1
--- 2,8 ----
  rm_...@ma... 1
  authenticated 2
! myrealbox.com 2
  subject:activation 1
  less 1
  membership 1
  adult 1
***************
*** 13,20 ****
  member 1
  recieve 1
- simply 1
  receive 1
  card 1
! digitalme.com 1
  wish 1
  subject:regarding 1
--- 12,18 ----
  member 1
  recieve 1
  receive 1
  card 1
! digitalme.com 2
  wish 1
  subject:regarding 1
***************
*** 23,27 ****
  to:ar...@my... 1
  here 2
- instanthome 1
  mailing 1
  section 1
--- 21,24 ----

Index: TestMailParse011.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse011.cam	16 Apr 2003 01:26:45 -0000	1.4
--- TestMailParse011.cam	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 4,8 ****
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
--- 4,8 ----
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! 	by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
***************
*** 15,20 ****
  Content-Transfer-Encoding: 7bit
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
! FILETIME=[8FDC2900:01BAAAABA]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>
--- 15,19 ----
  Content-Transfer-Encoding: 7bit
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC) FILETIME=[8FDC2900:01BAAAABA]
  X-Text-Classification: spam
  X-POPFile-Link: <http://127.0.0.1:8080/jump_to_message?view=popfile0=0.msg>

Index: TestMailParse011.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse011.msg,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse011.msg	16 Apr 2003 01:26:45 -0000	1.3
--- TestMailParse011.msg	26 Jun 2003 14:09:00 -0000	1.4
***************
*** 4,8 ****
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
--- 4,8 ----
  Delivered-To: spam-address-ccbill@domain
  Received: (qmail 26258 invoked by uid 421); 18 Jan 2003 06:22:49 -0000 blah blah
! 	by ekardia with Microsoft SMTPSVC(5.0.2122.2262);
  Sat, 18 Jan 2003 15:26:39 +0900
  Date: Sat, 18 Jan 2003 06:25:35 GMT
***************
*** 15,20 ****
  Content-Transfer-Encoding: 7bit
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC)
! FILETIME=[8FDC2900:01BAAAABA]
  
  I think you answered my ad longtime ago if it was not you I am sorry.
--- 15,19 ----
  Content-Transfer-Encoding: 7bit
  Message-ID: <EKARDIAX6Mmasdf78970016@ekardia>
! X-OriginalArrivalTime: 18 Jan 2003 06:26:40.0656 (UTC) FILETIME=[8FDC2900:01BAAAABA]
  
  I think you answered my ad longtime ago if it was not you I am sorry.

Index: TestMailParse012.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse012.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse012.wrd	21 Jan 2003 01:35:00 -0000	1.1
--- TestMailParse012.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 10,14 ****
  girl 1
  subject:tiny 1
! sunsinger 3
  you'll 1
  stop 1
--- 10,14 ----
  girl 1
  subject:tiny 1
! sunsinger 4
  you'll 1
  stop 1
***************
*** 28,32 ****
  animals 1
  subject:spam 1
! herald 3
  here 2
  subject:want 1
--- 28,32 ----
  animals 1
  subject:spam 1
! herald 4
  here 2
  subject:want 1

Index: TestMailParse013.cam
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.cam,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TestMailParse013.cam	16 Apr 2003 01:26:45 -0000	1.4
--- TestMailParse013.cam	26 Jun 2003 14:09:00 -0000	1.5
***************
*** 1,10 ****
- From rr...@nn... Mon Jan 06 05:00:37 2003
  Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
  Mime-Version: 1.0
  X-Sender: rR...@po...
  Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: 
!  <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...
!  >
  Date: Mon, 6 Jan 2003 02:00:37 -0800
  To: "Armlet Forum" <arm...@ne...>
--- 1,7 ----
  Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
  Mime-Version: 1.0
  X-Sender: rR...@po...
  Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...>
  Date: Mon, 6 Jan 2003 02:00:37 -0800
  To: "Armlet Forum" <arm...@ne...>

Index: TestMailParse013.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse013.msg	7 Feb 2003 22:24:33 -0000	1.1
--- TestMailParse013.msg	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 1,10 ****
- From rr...@nn... Mon Jan 06 05:00:37 2003
  Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
  Mime-Version: 1.0
  X-Sender: rR...@po...
  Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: 
!  <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...
!  >
  Date: Mon, 6 Jan 2003 02:00:37 -0800
  To: "Armlet Forum" <arm...@ne...>
--- 1,7 ----
  Received: from palm.lyris.net [216.91.57.210] by ajw.com [127.0.0.1] with SMTP (MDaemon.v2.7.SP4.R) for <Ar...@aj...>; Mon, 06 Jan 2003 05:00:43 -0500
  Mime-Version: 1.0
  X-Sender: rR...@po...
  Message-Id: <LYRIS-57933-146278-2003.01.06-02.00.42--alan#aj...@ne...>
! In-Reply-To: <LYRIS-54343-146225-2003.01.06-00.00.02--rrr#nnn...@ne...>
  Date: Mon, 6 Jan 2003 02:00:37 -0800
  To: "Armlet Forum" <arm...@ne...>

Index: TestMailParse013.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse013.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse013.wrd	24 Jan 2003 23:18:44 -0000	1.2
--- TestMailParse013.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 17,21 ****
  mode 1
  arm 1
- nnnnnnnnn.com 1
  wrote 1
  register 3
--- 17,20 ----
***************
*** 42,46 ****
  developer 1
  course 1
! palmos.com 6
  to:news.palmos.com 1
  won't 2
--- 41,45 ----
  developer 1
  course 1
! palmos.com 7
  to:news.palmos.com 1
  won't 2
***************
*** 49,53 ****
  see 1
  please 1
- rr...@nn... 1
  posted 1
  ajw.com 3
--- 48,51 ----
***************
*** 85,89 ****
  forum 4
  renaming 1
! news.palmos.com 5
  mbf 1
  hhhhhh 1
--- 83,87 ----
  forum 4
  renaming 1
! news.palmos.com 6
  mbf 1
  hhhhhh 1
***************
*** 98,102 ****
  variable 2
  bounce 2
! rrr 1
  callbacks 1
  get 3
--- 96,100 ----
  variable 2
  bounce 2
! rrr 2
  callbacks 1
  get 3

Index: TestMailParse015.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse015.wrd,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestMailParse015.wrd	31 Jan 2003 17:24:51 -0000	1.3
--- TestMailParse015.wrd	26 Jun 2003 14:09:00 -0000	1.4
***************
*** 1,5 ****
  animals 1
  wen...@ms... 1
! herald 3
  html:comment 1
  here 2
--- 1,5 ----
  animals 1
  wen...@ms... 1
! herald 4
  html:comment 1
  here 2
***************
*** 20,24 ****
  66.125.127.84 2
  host 1
! vanyel 3
  dsl.pltn13.pacbell.net 2
  girls 1
--- 20,24 ----
  66.125.127.84 2
  host 1
! vanyel 4
  dsl.pltn13.pacbell.net 2
  girls 1

Index: TestMailParse017.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse017.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse017.wrd	27 Jan 2003 23:13:29 -0000	1.1
--- TestMailParse017.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 1,3 ****
- microsoft 1
  200.155.65.82 1
  site 2
--- 1,2 ----
***************
*** 11,15 ****
  from:hot...@ya... 1
  hottest 2
- smtpsvc 1
  203.146.108.97 1
  mx1.mail.yahoo.com 1
--- 10,13 ----

Index: TestMailParse019.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse019.wrd,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TestMailParse019.wrd	18 Feb 2003 06:25:38 -0000	1.2
--- TestMailParse019.wrd	26 Jun 2003 14:09:00 -0000	1.3
***************
*** 64,73 ****
  slice 1
  generated 2
! bu...@dr... 2
  vi.relativity.com 1
  archives 1
! postfix 1
  confirmed 1
! tepkom 3
  to:el...@te... 1
  to:bug...@re... 1
--- 64,73 ----
  slice 1
  generated 2
! bu...@dr... 1
  vi.relativity.com 1
  archives 1
! postfix 3
  confirmed 1
! tepkom 5
  to:el...@te... 1
  to:bug...@re... 1
***************
*** 79,83 ****
  internet 1
  63.100.138.144 1
! drunin.net 2
  fix 1
  subject:dev 1
--- 79,83 ----
  internet 1
  63.100.138.144 1
! drunin.net 1
  fix 1
  subject:dev 1

Index: TestMailParse020.wrd
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse020.wrd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse020.wrd	20 Feb 2003 21:36:44 -0000	1.1
--- TestMailParse020.wrd	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 65,69 ****
  moderator 1
  subject:please 1
- eplgcfxgcq 1
  pgp.mit.edu 1
  edit 1
--- 65,68 ----

Index: TestMailParse021.msg
===================================================================
RCS file: /cvsroot/popfile/engine/tests/TestMailParse021.msg,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMailParse021.msg	25 Feb 2003 02:04:13 -0000	1.1
--- TestMailParse021.msg	26 Jun 2003 14:09:00 -0000	1.2
***************
*** 1,36 ****
! Received: by mail (mbox dsmith)
!  (with Cubic Circle's cucipop (v1.31 1998/05/13) Wed Feb 12 21:05:46 2003)
! X-From_: cxc...@ya...  Wed Feb 12 20:51:28 2003
! Return-Path: <cxc...@ya...>
! Received: from srvexch.reichraming.helopal.com ([213.33.65.211])
! 	by mx.datasync.com (8.11.6/8.11.6) with ESMTP id h1D2pRM12104
! 	for <ds...@da...>; Wed, 12 Feb 2003 20:51:27 -0600
! Received: from mx1.mail.yahoo.com ([4.47.64.57]) by srvexch.reichraming.helopal.com with Microsoft SMTPSVC(5.0.2195.5329);
! 	 Thu, 13 Feb 2003 03:51:22 +0100
! Message-ID: <000067513ece$00005b27$000...@mx...>
! To: ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., 
! 	<ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>
! 	, <ds...@cr...>, 
! 	<ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, 
! 	<ds...@da...>
! CC: ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., 
! 	<ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, 
! 	<ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, 
! 	<ds...@dc...>, <ds...@da...>
! From: "MARGIT" <cxc...@ya...>
! Subject:  Enlarge your package Doctor ApprovedNHOBS
! Date: Wed, 12 Feb 2003 20:51:18 01800
! MIME-Version: 1.0
! Content-Type: text/html;
! 	charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! Reply-To: cxc...@ya...
! X-OriginalArrivalTime: 13 Feb 2003 02:51:23.0500 (UTC) FILETIME=[CB6012C0:01C2D30A]
! 
! <html><body><font face=Tahoma size=2 color=#FFFFFF><table border=0 width=489 height=41 bgcolor=#FFFFFF><tr><td width=100% height=35 bgcolor=#000000 align=center><font face=Impact size=3 color=#00FFFF>Take Control of Your Computer With This Top-of-the-Line Software!</font></td></tr></table><table border=5 cellspacing=3 width=489 cellpadding=3 bgcolor=#000080 bordercolor=#FFFFFF style="border-collapse: collapse" bordercolordark=#000000 height=567 bordercolorlight=#CCCCFF><tr><td width=467 height=555 bordercolorlight=#FFFFFF bordercolordark=#FFFF99><table border=6 width=100% height=86 bgcolor=#000000 bordercolor=#FFFFFF><tr><td width=100% height=80 align=center><b><font face=Tahoma size=6 color=#FFFFFF>
! Norton SystemWorks 2003</font><font color=#FF0000 face=Tahoma size=6> </font><font face=Tahoma size=5 color=#FFFF99> Software Suite</font><font color=#FF0000 face="Times New Roman" size=6><br> </font><font face="Times New Roman" size=6 color=#CCCCFF> -<i>Professional Edition</i>-</font></b></td></tr></table><table border=0 width=100% height=62><tr><td width=100% height=56 align=center><b><font face=Tahoma size=4 color=#CCFFFF>Includes Six - </font><font face=Tahoma size=4 color=#FFFFFF><i>Yes 6!</i> </font><font face=Tahoma size=4 color=#CCFFFF> - Feature-Packed Utilities<br>ALL for </font><font face=Tahoma size=4 color=#FFFFFF>1 Special LOW Price of Only $39.99!</font></b></td></tr></table><table border=4 width=100% height=135 bgcolor=#000080 bordercolor=#CCCCFF><tr><td width=100% height=129 bgcolor=#000000 bordercolor=#000080><b><font face=Tahoma size=2><font color=#FFFF99>This Software Will:<font face=Tahoma size=1 color=#000000></font><font color=#FFFFFF><br>&nbsp;- Protect your computer from unwanted and <i> hazardous</i> viruses<br>&nbsp;- Help secure your private &amp; valuable information<br>&nbsp;- Allow you to transfer files and send e-mails <u> safely</u><br>&nbsp;- Backup your ALL your data quick and easily<br>&nbsp;- Improve your PC's performance w/<i>superior</i> integral diagnostics!<br>&nbsp;- <i>You'll NEVER have to take your PC to the repair shop AGAIN!</i></font></font></b></td></tr></table>&nbsp;<table border=4 width=100% height=4 bgcolor=#000000 bordercolor=#CCCCFF><tr><td width=100% height=1><p align=center><b><font face=Tahoma size=5 color=#FFFFFF>6</font><font size=5 face=Tahoma><font color=#00FFFF> Top-of-the-Line </font></font><font face=Tahoma size=5 color=#FFFFFF> Utilities</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000080 size=5><br></font><u>1 </u></font></font><u><font face=Tahoma size=5 color=#FFFFFF> Great Price</font></u><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF><br> A </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF>$249+</font><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF> </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF> Combined Retail Value</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000000 size=5> </font> <i>YOURS</i> </font></font><font face=Tahoma size=5 color=#FFFFFF> for a limited time</font><font size=5 face=Tahoma><font color=#00FFFF> for Only !!!</font></font><font face=Tahoma size=5 color=#FFFFFF>$39.99</font><font face=Tahoma size=5 color=#00FFFF>!!!</font><font size=6><br> </font></b><font face=Tahoma size=4><font color=#00FFFF>&lt; </font></font><font face=Tahoma size=4 color=#FFFFFF> Price Includes FREE Shipping! </font><font color=#00FFFF><font face=Tahoma size=4> &gt;<br></font></font><font face=Impact size=4 color=#CCFFFF>And For a Limited time Buy 2 of Our Products &amp; Get 1 Free!</font></td></tr></table><p align=Center><b><font face=Tahoma size=3 color=#FFFFFF>Don't fall prey to destructive viruses or hackers!<br>Protect&nbsp; your computer and your valuable information and</font></b></p><table border=4 width=100% height=44 bordercolor=#FFFFFF bgcolor=#000080><tr><td width=100% height=38 bgcolor=#FFFFFF align=center><b>
! <a style="color: #FF0000; font-family: Verdana; font-size: 14pt; font-weight: bold" href="http://www.upgradesrus.net/nortonsw3.htm"><font face=Tahoma size=4 color=#0000FF>-&gt; CLICK HERE to Order Yours NOW! &lt;-</font></a></b></td></tr></table><br><p align=Center><font color=#ffffff size=5 face=Tahoma> <p align=Center><font color=#ffffff size=1 face=Tahoma>Your email address was obtained from an opt-in list. Opt-in EAF (Ecommerce Anti-Spam Federation) Approved List - Type UPC Prefix = YY*wud02FLUS.&nbsp;To unsubscribe from this list, please
! <a style="color: #ffffcc" href="http://www.upgradesrus.net/remove.asp">Click here</a> . Please allow 5 Business days for removal. We do not condone spam in any shape or form. Thank You kindly for your cooperation.</font></td></tr></table><font face=Tahoma size=4 color=#FFFFFF></body></html>
! 
! 
! 
--- 1,36 ----
! Received: by mail (mbox dsmith)
!  (with Cubic Circle's cucipop (v1.31 1998/05/13) Wed Feb 12 21:05:46 2003)
! X-From_: cxc...@ya...  Wed Feb 12 20:51:28 2003
! Return-Path: <cxc...@ya...>
! Received: from srvexch.reichraming.helopal.com ([213.33.65.211])
! 	by mx.datasync.com (8.11.6/8.11.6) with ESMTP id h1D2pRM12104
! 	for <ds...@da...>; Wed, 12 Feb 2003 20:51:27 -0600
! Received: from mx1.mail.yahoo.com ([4.47.64.57]) by srvexch.reichraming.helopal.com with Microsoft SMTPSVC(5.0.2195.5329);
! 	 Thu, 13 Feb 2003 03:51:22 +0100
! Message-ID: <000067513ece$00005b27$000...@mx...>
! To: ds...@ct..., ds...@do..., ds...@di..., ds...@di..., ds...@cr..., 
! 	<ds...@cy...>, <ds...@do...>, <ds...@db...>, <ds...@cs...>
! 	, <ds...@cr...>, 
! 	<ds...@dr...>, <ds...@cv...>, <ds...@dm...>, <ds...@da...>, 
! 	<ds...@da...>
! CC: ds...@dm..., ds...@da..., ds...@cr..., ds...@da..., 
! 	<ds...@do...>, <ds...@dn...>, <ds...@cy...>, <ds...@cs...>, 
! 	<ds...@di...>, <ds...@cv...>, <ds...@dr...>, <ds...@cr...>, 
! 	<ds...@dc...>, <ds...@da...>
! From: "MARGIT" <cxc...@ya...>
! Subject:  Enlarge your package Doctor ApprovedNHOBS
! Date: Wed, 12 Feb 2003 20:51:18 01800
! MIME-Version: 1.0
! Content-Type: text/html;
! 	charset="iso-8859-1"
! Content-Transfer-Encoding: quoted-printable
! Reply-To: cxc...@ya...
! X-OriginalArrivalTime: 13 Feb 2003 02:51:23.0500 (UTC) FILETIME=[CB6012C0:01C2D30A]
! 
! <html><body><font face=Tahoma size=2 color=#FFFFFF><table border=0 width=489 height=41 bgcolor=#FFFFFF><tr><td width=100% height=35 bgcolor=#000000 align=center><font face=Impact size=3 color=#00FFFF>Take Control of Your Computer With This Top-of-the-Line Software!</font></td></tr></table><table border=5 cellspacing=3 width=489 cellpadding=3 bgcolor=#000080 bordercolor=#FFFFFF style="border-collapse: collapse" bordercolordark=#000000 height=567 bordercolorlight=#CCCCFF><tr><td width=467 height=555 bordercolorlight=#FFFFFF bordercolordark=#FFFF99><table border=6 width=100% height=86 bgcolor=#000000 bordercolor=#FFFFFF><tr><td width=100% height=80 align=center><b><font face=Tahoma size=6 color=#FFFFFF>
! Norton SystemWorks 2003</font><font color=#FF0000 face=Tahoma size=6> </font><font face=Tahoma size=5 color=#FFFF99> Software Suite</font><font color=#FF0000 face="Times New Roman" size=6><br> </font><font face="Times New Roman" size=6 color=#CCCCFF> -<i>Professional Edition</i>-</font></b></td></tr></table><table border=0 width=100% height=62><tr><td width=100% height=56 align=center><b><font face=Tahoma size=4 color=#CCFFFF>Includes Six - </font><font face=Tahoma size=4 color=#FFFFFF><i>Yes 6!</i> </font><font face=Tahoma size=4 color=#CCFFFF> - Feature-Packed Utilities<br>ALL for </font><font face=Tahoma size=4 color=#FFFFFF>1 Special LOW Price of Only $39.99!</font></b></td></tr></table><table border=4 width=100% height=135 bgcolor=#000080 bordercolor=#CCCCFF><tr><td width=100% height=129 bgcolor=#000000 bordercolor=#000080><b><font face=Tahoma size=2><font color=#FFFF99>This Software Will:<font face=Tahoma size=1 color=#000000></font><font color=#FFFFFF><br>&nbsp;- Protect your computer from unwanted and <i> hazardous</i> viruses<br>&nbsp;- Help secure your private &amp; valuable information<br>&nbsp;- Allow you to transfer files and send e-mails <u> safely</u><br>&nbsp;- Backup your ALL your data quick and easily<br>&nbsp;- Improve your PC's performance w/<i>superior</i> integral diagnostics!<br>&nbsp;- <i>You'll NEVER have to take your PC to the repair shop AGAIN!</i></font></font></b></td></tr></table>&nbsp;<table border=4 width=100% height=4 bgcolor=#000000 bordercolor=#CCCCFF><tr><td width=100% height=1><p align=center><b><font face=Tahoma size=5 color=#FFFFFF>6</font><font size=5 face=Tahoma><font color=#00FFFF> Top-of-the-Line </font></font><font face=Tahoma size=5 color=#FFFFFF> Utilities</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000080 size=5><br></font><u>1 </u></font></font><u><font face=Tahoma size=5 color=#FFFFFF> Great Price</font></u><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF><br> A </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF>$249+</font><font color=#000000 size=5> <font size=5 face=Tahoma><font color=#00FFFF> </font></font> </font> <font face=Tahoma size=5 color=#FFFFFF> Combined Retail Value</font><font size=5 face=Tahoma><font color=#00FFFF><font color=#000000 size=5> </font> <i>YOURS</i> </font></font><font face=Tahoma size=5 color=#FFFFFF> for a limited time</font><font size=5 face=Tahoma><font color=#00FFFF> for Only !!!</font></font><font face=Tahoma size=5 color=#FFFFFF>$39.99</font><font face=Tahoma size=5 color=#00FFFF>!!!</font><font size=6><br> </font></b><font face=Tahoma size=4><font color=#00FFFF>&lt; </font></font><font face=Tahoma size=4 color=#FFFFFF> Price Includes FREE Shipping! </font><font color=#00FFFF><font face=Tahoma size=4> &gt;<br></font></font><font face=Impact size=4 color=#CCFFFF>And For a Limited time Buy 2 of Our Products &amp; Get 1 Free!</font></td></tr></table><p align=Center><b><font face=Tahoma size=3 color=#FFFFFF>Don't fall prey to destructive viruses or hackers!<br>Protect&nbsp; your computer and your valuable information and</font></b></p><table border=4 width=100% height=44 bordercolor=#FFFFFF bgcolor=#000080><tr><td width=100% height=38 bgcolor=#FFFFFF align=center><b>
! <a style="color: #FF0000; font-family: Verdana; font-size: 14pt; font-weight: bold" href="http://www.upgradesrus.net/nortonsw3.htm"><font face=Tahoma size=4 color=#0000FF>-&gt; CLICK HERE to Order Yours NOW! &lt;-</font></a></b></td></tr></table><br><p align=Center><font color=#ffffff size=5 face=Tahoma> <p align=Center><font color=#ffffff size=1 face=Tahoma>Your email address was obtained from an opt-in list. Opt-in EAF (Ecommerce Anti-Spam Federation) Approved List - Type UPC Prefix = YY*wud02FLUS.&nbsp;To unsubscribe from this list, please
! <a style="color: #ffffcc" href="http://www.upgradesrus.net/remove.asp">Click here</a> . Please allow 5 Business days for removal. We do not condone spam in any shape or form. Thank You kindly for your cooperation.</font></td></tr></table><font face=Tahoma size=4 color=#FFFFFF></body></html>
! 
! 
!