Fixes to better handle binary FormData.

Author: gvanmat

src/www/ios/formdata-polyfill.js

@@ -241,11 +241,12 @@
     for (var i = 0; i < entries.length; i++)
     {
       var entry = entries[i];
-      bodyEntries.push(__FormData._generateMultipartFormData(entry, boundary));
+      for (var data of __FormData._generateMultipartFormData(entry, boundary)) 
+        bodyEntries.push(data);
     }
 
     bodyEntries.push("--" + boundary + "--");
-    parts.body = bodyEntries.join("");
+    parts.body = new Blob(bodyEntries, {type: "application/octet-stream"});
 
     return parts;
   };
@@ -305,11 +306,11 @@
           resolve({name: name, value: reader.error, filename: filename, type: type});
         };
 
-        reader.readAsBinaryString(value);
+        reader.readAsArrayBuffer(value);
       }
       else
       {
-        promise = resolve({name: name, value: "" + value});
+        promise = resolve({name: name, value: value});
       }
     });
 
@@ -318,24 +319,31 @@
 
   __FormData._generateMultipartFormData = function (entry, boundary)
   {
-    var data = "";
+    var data = [];
 
-    data += "--" + boundary + "\r\n";
+    data.push("--" + boundary + "\r\n");
     if (!entry['filename'])
     {
-      data += 'content-disposition: form-data; name="' + entry.name + '"\r\n';
-      data += '\r\n';
-      data += entry.value + "\r\n";
+      data.push('content-disposition: form-data; name="');
+      data.push(entry.name);
+      data.push('"\r\n');
+      data.push('\r\n');
+      data.push(entry.value);
+      data.push("\r\n");
     }
     else
     {
       // Describe it as form data
-      data += 'content-disposition: form-data; ';
-      data += 'name="' + entry.name + '"; ';
-      data += 'filename="' + entry.filename + '"\r\n';
-      data += 'Content-Type: ' + entry.type + '\r\n';
-      data += '\r\n';
-      data += entry.value + '\r\n';
+      data.push('content-disposition: form-data; name="');
+      data.push(entry.name)
+      data.push('"; filename="');
+      data.push(entry.filename);
+      data.push('"\r\n');
+      data.push('Content-Type: ');
+      data.push(entry.type);
+      data.push('\r\n\r\n');
+      data.push(entry.value);
+      data.push('\r\n');
     }
 
     return data;

src/www/ios/xhr-polyfill.js

@@ -327,7 +327,19 @@
               if (!contentType)
                 reqContext.requestHeaders["content-type"] = parts.contentType;
 
-              resolve(HttpHandler._convertTextToBinaryBase64String(contentType, parts.body));
+              var reader = new FileReader();
+              reader.onload = function ()
+              {
+                var base64str = btoa(reader.result);
+                resolve(base64str);
+              };
+              reader.onerror = function ()
+              {
+                var base64str = btoa(reader.error);
+                reject(base64str);
+              };
+
+              reader.readAsBinaryString(parts.body);
             });
           });
 

tests/tests.js

@@ -247,6 +247,59 @@ exports.defineAutoTests = function ()
 
     });
 
+    it("download/upload/binary compare", function(done)
+    {
+      // 1) download an image as a blob
+      // 2) add the blob to a form data and send it back to the server as a multipart form
+      // 3) server performs a binary compare of the original file to the uploaded
+      // 4) returns a document response with the results of the compare
+
+      var downloadPromise = new Promise(function (resolve, reject)
+      {
+        var xhr = new XMLHttpRequest();
+        xhr.onloadend = function (event)
+        {          
+          resolve(xhr.response);
+        };
+        xhr.onerror = function (event)
+        {
+          reject(xhr.response);
+          
+        };
+        
+        xhr.responseType = "blob";
+        xhr.open("GET", SECURE_TESTS_DOMAIN + "/RestApp-ViewController-context-root/servletmultipartplayback");
+        xhr.send();
+      });
+      
+      downloadPromise.then(function (blob) 
+      {
+        expect(blob).toBeDefined();
+        expect(blob instanceof Blob).toEqual(true);
+        expect(blob.type).toEqual("image/png");
+        
+        var fd = new FormData();
+        fd.append("simple-test", blob, "simple-test.html");
+        
+        var xhr = new XMLHttpRequest();
+        xhr.onloadend = function ()
+        {
+          expect(this.readyState).toBe(this.DONE);
+          expect(this.status).toBe(200);
+          expect(this.response instanceof Document).toEqual(true);
+          expect(this.response.querySelector("#are-same").textContent).toEqual("true");
+          done();
+        };
+        xhr.responseType = "document";
+        xhr.open("POST", SECURE_TESTS_DOMAIN + "/RestApp-ViewController-context-root/servletmultipartplayback");
+        xhr.send(fd);
+     
+      });
+      
+      
+    }, 120000);
+    
+    
   });
 
   describe('http:// GET remote:', function ()