From 033a4c41e0440106a0dffdd7328cd8b04781b45d Mon Sep 17 00:00:00 2001 From: Heungsub Lee Date: Wed, 7 Jul 2010 12:38:54 +0800 Subject: [PATCH 1/2] Added a default quality of `*/*` for content negotiation. --- src/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ajax.js b/src/ajax.js index a9e13a87..897d424d 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -377,7 +377,7 @@ jQuery.extend({ // Set the Accepts header for the server, depending on the dataType xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? - s.accepts[ s.dataType ] + ", */*" : + s.accepts[ s.dataType ] + ", */*; q=0.01" : s.accepts._default ); } catch( headerError ) {} From c8c8f8458a579d8f87e7ee6b8e4510cc4e4445bb Mon Sep 17 00:00:00 2001 From: dmethvin Date: Sun, 27 Jun 2010 09:16:39 +0800 Subject: [PATCH 2/2] For JSON and script requests, set the scriptCharset before the url so IE won't interpret it the wrong way; fixes #4855. --- src/ajax.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ajax.js b/src/ajax.js index 897d424d..17cccf71 100644 --- a/src/ajax.js +++ b/src/ajax.js @@ -300,10 +300,10 @@ jQuery.extend({ if ( s.dataType === "script" && type === "GET" && remote ) { var head = document.getElementsByTagName("head")[0] || document.documentElement; var script = document.createElement("script"); - script.src = s.url; if ( s.scriptCharset ) { script.charset = s.scriptCharset; } + script.src = s.url; // Handle Script loading if ( !jsonp ) {