accept spaces in RFC2047-encoded headers

The RFC says spaces must not appear in encoded words but we can accept and decode them. Fixes sup-heliotrope#424.
danc86 · Jul 19, 2020 · 8c69271 · 8c69271
1 parent cf21f61
commit 8c69271
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/sup/rfc2047.rb b/lib/sup/rfc2047.rb
@@ -17,7 +17,7 @@
 # This file is distributed under the same terms as Ruby.
 
 module Rfc2047
-  WORD = %r{=\?([!\#$%&'*+-/0-9A-Z\\^\`a-z{|}~]+)\?([BbQq])\?([!->@-~]+)\?=} # :nodoc: 'stupid ruby-mode
+  WORD = %r{=\?([!\#$%&'*+-/0-9A-Z\\^\`a-z{|}~]+)\?([BbQq])\?([!->@-~ ]+)\?=} # :nodoc: 'stupid ruby-mode
   WORDSEQ = %r{(#{WORD.source})\s+(?=#{WORD.source})}
 
   def Rfc2047.is_encoded? s; s =~ WORD end

diff --git a/test/fixtures/rfc2047-header-encoding.eml b/test/fixtures/rfc2047-header-encoding.eml
@@ -2,7 +2,7 @@ From: [email protected]
 To: [email protected]
 Date: Sun, 19 Jul 2020 17:03:56 +1000
 Subject:
- =?US-ASCII?q?Hans_Martin_Djupvik?= =?ISO-8859-1?q?,_Ingrid_B=F8?=
+ =?US-ASCII?q?Hans Martin Djupvik?= =?ISO-8859-1?q?,_Ingrid_B=F8?=
  =?KOI8-R?b?LCDp0snOwSDzycTP0s/XwQ?=
  =?UTF-16?b?//4sACAASgBlAHMAcABlAHIAIABCAGUAcgBnAA?=