Merging in changes from topic/imap_speed_improvements, from 40a2902 to …

…ab3823c
ruby · tonyarkles · Oct 6, 2012 · Oct 6, 2012 · Oct 6, 2012 · Oct 6, 2012
commit f17ed14e967e9b49db443d2d3882cad51b4dd51d
diff --git a/lib/net/imap.rb b/lib/net/imap.rb
@@ -2034,6 +2034,14 @@ def media_subtype
       end
     end
 
+    class BodyTypeExtension < Struct.new(:media_type, :subtype, 
+                                         :params, :content_id,
+                                         :description, :encoding, :size)
+      def multipart?
+        return false
+      end
+    end
+
     class ResponseParser # :nodoc:
       def initialize
         @str = nil
@@ -2403,6 +2411,19 @@ def body_type_msg
         mtype, msubtype = media_type
         match(T_SPACE)
         param, content_id, desc, enc, size = body_fields
+
+        # If this is not message/rfc822, we shouldn't apply the RFC822 spec
+        # to it.
+        # We should handle anything other than message/rfc822 using
+        # multipart extension data [rfc3501] (i.e. the data itself won't be 
+        # returned, we would have to retrieve it with BODYSTRUCTURE instead
+        # of with BODY
+        if "#{mtype}/#{msubtype}" != 'MESSAGE/RFC822' then
+          return BodyTypeExtension.new(mtype, msubtype, 
+                                       param, content_id,
+                                       desc, enc, size)
+        end
+
         match(T_SPACE)
         env = envelope
         match(T_SPACE)

diff --git a/test/net/imap/test_imap_response_parser.rb b/test/net/imap/test_imap_response_parser.rb
@@ -152,4 +152,17 @@ def test_body_type_attachment
     assert_equal("Fw_ ____ _____ ____.eml",
       response.data.attr["BODYSTRUCTURE"].parts[1].body.param["FILENAME"])
   end
+
+  def assert_parseable(s)
+    parser = Net::IMAP::ResponseParser.new
+    parser.parse(s.gsub(/\n/, "\r\n").taint)
+  end
+
+  def test_msg_delivery_status
+    # This was part of a larger response that caused crashes, but this was the
+    # minimal test case to demonstrate it
+    assert_parseable <<EOF
+* 4902 FETCH (BODY (("MESSAGE" "DELIVERY-STATUS" NIL NIL NIL "7BIT" 324) "REPORT"))
+EOF
+  end
 end