handle trailing spaces in message headers (doh\!)

git-svn-id: svn://rubyforge.org/var/svn/sup/trunk@391 5c8cc53c-5e98-4d25-b20a-d8db53a31250

diff --git a/lib/sup/mbox.rb b/lib/sup/mbox.rb
index a4f50462416de8703770ca5629b9bfdb7fb0a6d6..e2b119a6cae45593beff2da211e61126e7a365f1 100644 (file)
--- a/lib/sup/mbox.rb
+++ b/lib/sup/mbox.rb
@@ -16,24 +16,24 @@ module MBox
     ## when scanning over large mbox files.
     while(line = f.gets)
       case line
-      when /^(From):\s+(.*)$/i,
-        /^(To):\s+(.*)$/i,
-        /^(Cc):\s+(.*)$/i,
-        /^(Bcc):\s+(.*)$/i,
-        /^(Subject):\s+(.*)$/i,
-        /^(Date):\s+(.*)$/i,
-        /^(Message-Id):\s+<(.*)>$/i,
-        /^(References):\s+(.*)$/i,
-        /^(In-Reply-To):\s+(.*)$/i,
-        /^(Reply-To):\s+(.*)$/i,
-        /^(List-Post):\s+(.*)$/i,
-        /^(Status):\s+(.*)$/i: header[last = $1] = $2
+      when /^(From):\s+(.*)\s*$/i,
+        /^(To):\s+(.*)\s*$/i,
+        /^(Cc):\s+(.*)\s*$/i,
+        /^(Bcc):\s+(.*)\s*$/i,
+        /^(Subject):\s+(.*)\s*$/i,
+        /^(Date):\s+(.*)\s*$/i,
+        /^(Message-Id):\s+<(.*)>\s*$/i,
+        /^(References):\s+(.*)\s*$/i,
+        /^(In-Reply-To):\s+(.*)\s*$/i,
+        /^(Reply-To):\s+(.*)\s*$/i,
+        /^(List-Post):\s+(.*)\s*$/i,
+        /^(Status):\s+(.*)\s*$/i: header[last = $1] = $2
 
       ## these next three can occur multiple times, and we want the
       ## first one
       when /^(Delivered-To):\s+(.*)$/i,
         /^(X-Original-To):\s+(.*)$/i,
-        /^(Envelope-To):\s+(.*)$/i: header[last = $1.downcase] ||= $2
+        /^(Envelope-To):\s+(.*)$/i: header[last = $1] ||= $2
 
       when /^$/: break
       when /:/: last = nil