X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax.js;h=853bcbb43994876ab2cfd098ff0e8bca6c115c9f;hb=a27b5d0468acc5dd8cdfcbff9464546b353e3c04;hp=dbe731b294502665fde9f5c9188e6d6e39ea72d7;hpb=c90fe0283bac94327a8a8ec75e7292322c77dd01;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index dbe731b..853bcbb 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -236,12 +236,13 @@ jQuery.extend({
 			jQuery.event.trigger( "ajaxStart" );
 
 		// Matches an absolute URL, and saves the domain
-		var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
+		var parts = /^(\w+:)?\/\/([^\/?#]+)/.exec( s.url );
 
 		// If we're requesting a remote document
 		// and trying to load JSON or Script with a GET
-		if ( s.dataType == "script" && type == "GET"
-				&& remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
+		if ( s.dataType == "script" && type == "GET" && parts
+			&& ( parts[1] && parts[1] != location.protocol || parts[2] != location.host )){
+
 			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;
@@ -469,7 +470,8 @@ jQuery.extend({
 			throw "parsererror";
 			
 		// Allow a pre-filtering function to sanitize the response
-		if( s.dataFilter )
+		// s != null is checked to keep backwards compatibility
+		if( s && s.dataFilter )
 			data = s.dataFilter( data, type );
 
 		// If the type is "script", eval it in global context