Report correct Error object to handleError. Part of the fix for #6677.

[jquery.git] / src / ajax.js

diff --git a/src/ajax.js b/src/ajax.js
index 5d93af6..baf7ae8 100644 (file)
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -302,10 +302,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 ) {
@@ -379,7 +379,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 ) {}
 
@@ -494,7 +494,7 @@ jQuery.extend({
                        xhr.send( (type !== "GET" && s.data) || null );
 
                } catch( sendError ) {
-                       jQuery.ajax.handleError( s, xhr, null, e );
+                       jQuery.ajax.handleError( s, xhr, null, sendError );
 
                        // Fire the complete handlers
                        jQuery.ajax.handleComplete( s, xhr, status, data );