commit eb8e4699a6b88fb1d98d1315a36d36e69c40e231
parent 3915bcc14d6b5323983be0bbfaabca49866bffaa
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 18 Feb 2008 06:01:11 -0800
Merge branch 'parse-tweaks' into next
Diffstat:
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/lib/sup/mbox.rb b/lib/sup/mbox.rb
@@ -20,26 +20,26 @@ module MBox
## when scanning over large mbox files.
while(line = f.gets)
case line
- 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,
- /^(References):\s+(.*?)\s*$/i,
- /^(In-Reply-To):\s+(.*?)\s*$/i,
- /^(Reply-To):\s+(.*?)\s*$/i,
- /^(List-Post):\s+(.*?)\s*$/i,
- /^(List-Subscribe):\s+(.*?)\s*$/i,
- /^(List-Unsubscribe):\s+(.*?)\s*$/i,
- /^(Status):\s+(.*?)\s*$/i: header[last = $1] = $2
- when /^(Message-Id):\s+(.*?)\s*$/i: header[mid_field = 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,
+ /^(References):\s*(.*?)\s*$/i,
+ /^(In-Reply-To):\s*(.*?)\s*$/i,
+ /^(Reply-To):\s*(.*?)\s*$/i,
+ /^(List-Post):\s*(.*?)\s*$/i,
+ /^(List-Subscribe):\s*(.*?)\s*$/i,
+ /^(List-Unsubscribe):\s*(.*?)\s*$/i,
+ /^(Status):\s*(.*?)\s*$/i: header[last = $1] = $2
+ when /^(Message-Id):\s*(.*?)\s*$/i: header[mid_field = 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] ||= $2
+ when /^(Delivered-To):\s*(.*)$/i,
+ /^(X-Original-To):\s*(.*)$/i,
+ /^(Envelope-To):\s*(.*)$/i: header[last = $1] ||= $2
when /^$/: break
when /^\S+: /: last = nil # some other header we don't care about