From: jeresig <jeresig@gmail.com>
Date: Fri, 24 Sep 2010 21:05:28 +0000 (-0400)
Subject: Merge branch 'master' of github.com:jquery/jquery
X-Git-Url: http://git.asbjorn.biz/?a=commitdiff_plain;h=700ff05af0d30722dcc23a69849bfb278fdc7e75;hp=-c;p=jquery.git

Merge branch 'master' of github.com:jquery/jquery
---

700ff05af0d30722dcc23a69849bfb278fdc7e75
diff --combined src/ajax.js
index 5d93af6,17cccf7..71bdd46
--- a/src/ajax.js
+++ b/src/ajax.js
@@@ -207,9 -207,7 +207,9 @@@ jQuery.extend(
  			jsonp, status, data, type = s.type.toUpperCase();
  
  		s.url = s.url.replace( rhash, "" );
 -		s.context = origSettings && origSettings.context || s;
 +
 +		// Use original (not extended) context object if it was provided
 +		s.context = origSettings && origSettings.context != null ? origSettings.context : s;
  
  		// convert data if not already a string
  		if ( s.data && s.processData && typeof s.data !== "string" ) {
@@@ -302,10 -300,10 +302,10 @@@
  		if ( s.dataType === "script" && type === "GET" && remote ) {
  			var head = document.getElementsByTagName("head")[0] || document.documentElement;
  			var script = document.createElement("script");
  			if ( s.scriptCharset ) {
  				script.charset = s.scriptCharset;
  			}
+ 			script.src = s.url;
  
  			// Handle Script loading
  			if ( !jsonp ) {
@@@ -379,7 -377,7 +379,7 @@@
  
  			// 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 ) {}