Bug 773592: suppor MMS headers with multiple values, r=philikon

dom/mms/src/ril/MmsPduHelper.jsm

@@ -972,7 +972,14 @@ let PduHelper = {
       header = HeaderField.decode(data, headers);
 
       if (header) {
-        headers[header.name] = header.value;
+        let orig = headers[header.name];
+        if (Array.isArray(orig)) {
+          headers[header.name].push(header.value);
+        } else if (orig) {
+          headers[header.name] = [orig, header.value];
+        } else {
+          headers[header.name] = header.value;
+        }
         if (header.name == "content-type") {
           // `... if the PDU contains a message body the Content Type MUST be
           // the last header field, followed by message body.` See

dom/mms/tests/test_mms_pdu_helper.js

@@ -550,3 +550,46 @@ add_test(function test_StatusValue_encode() {
   run_next_test();
 });
 
+//
+// Test target: PduHelper
+//
+
+//// PduHelper.parseHeaders ////
+
+add_test(function test_PduHelper_parseHeaders() {
+  function parse(input, expect, exception) {
+    let data = {array: input, offset: 0};
+    do_check_throws(wsp_test_func.bind(null, MMS.PduHelper.parseHeaders, data, expect),
+                    exception);
+  }
+
+  // Parse ends with Content-Type
+  let expect = {};
+  expect["x-mms-mms-version"] = MMS_VERSION;
+  expect["content-type"] = {
+    media: "application/vnd.wap.multipart.related",
+    params: null,
+  };
+  parse([0x80 | 0x0D, 0x80 | MMS_VERSION,   // X-Mms-Mms-Version: 1.3
+         0x80 | 0x04, 0x80 | 0x33,          // Content-Type: application/vnd.wap.multipart.related
+	 0x80 | 0x0C, MMS_PDU_TYPE_SEND_REQ // X-Mms-Message-Type: M-Send.req
+        ], expect);
+
+  // Parse header fields with multiple entries
+  expect = {
+    to: [
+      { address: "+123", type: "PLMN" },
+      { address: "+456", type: "num" },
+    ],
+  };
+  expect["content-type"] = {
+    media: "application/vnd.wap.multipart.related",
+    params: null,
+  };
+  parse(Array.concat([0x80 | 0x17]).concat(strToCharCodeArray("+123/TYPE=PLMN"))
+             .concat([0x80 | 0x17]).concat(strToCharCodeArray("+456"))
+             .concat([0x80 | 0x04, 0x80 | 0x33]),
+        expect);
+
+  run_next_test();
+});