Merge pull request #70 from canjs/multipart

Do not set Content-Type for FormData payload

Author: m-mujica

can-ajax-test.js

@@ -542,7 +542,7 @@ if (hasLocalServer) {
 
 QUnit.test("It doesn't stringify FormData", function(assert) {
 	var done = assert.async();
-	var headers = {};
+
 	var formData = new FormData();
 	formData.append('foo', 'bar');
 
@@ -575,8 +575,12 @@ QUnit.test("It doesn't stringify FormData", function(assert) {
 		url: url,
 		data: formData
 	}).then(function(value){
-		assert.equal(value["Content-Type"], "application/json");
 		assert.equal(value.url, url);
+		assert.equal(
+			typeof value["Content-Type"],
+			"undefined",
+			"Content-Type should not be set"
+		);
 	}, function (reason) {
 		assert.notOk(reason, "request failed with reason = ", reason);
 	})

can-ajax.js

@@ -232,17 +232,19 @@ function ajax(o) {
 
 	if (isPost) {
 		if (isFormData) {
-			// don't stringify FormData XHR handles it natively
+			// do not set "Content-Type" let the browser handle it
+			// do not stringify FormData XHR handles it natively
 			data = o.data;
 		} else {
-			data = (isJsonContentType && !isSimpleCors) ?
-				(typeof o.data === "object" ? JSON.stringify(o.data) : o.data):
-				param(o.data);
+			if (isJsonContentType && !isSimpleCors) {
+				data = typeof o.data === "object" ? JSON.stringify(o.data) : o.data;
+				xhr.setRequestHeader("Content-Type", "application/json");
+			} else {
+				data = param(o.data);
+				// CORS simple: `Content-Type` has to be `application/x-www-form-urlencoded`:
+				xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+			}
 		}
-			// CORS simple: `Content-Type` has to be `application/x-www-form-urlencoded`:
-		var setContentType = (isJsonContentType && !isSimpleCors) ?
-			"application/json" : "application/x-www-form-urlencoded";
-		xhr.setRequestHeader("Content-Type", setContentType);
 	} else {
 		xhr.setRequestHeader("Content-Type", o.contentType);
 	}