X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax.js;h=dbea8d5d4883365540119f80aaad19ea7846cd2c;hb=57cc182a40e909868d41f9b1bb405b06138f6cae;hp=e910aa56f73d78c92e347450de6e3a867af68d6b;hpb=c55a76a23fdf8e9b22d9792a0f3a39051cc33993;p=jquery.git

diff --git a/src/ajax.js b/src/ajax.js
index e910aa5..dbea8d5 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -520,12 +520,15 @@ jQuery.extend({
 		// Determine if a cross-domain request is in order
 		var parts = rurl.exec( s.url.toLowerCase() ),
 			loc = location;
-		s.crossDomain = !!(
-				parts &&
-				( parts[ 1 ] && parts[ 1 ] != loc.protocol ||
-					parts[ 2 ] != loc.hostname ||
-					( parts[ 3 ] || 80 ) != ( loc.port || 80 ) )
-		);
+
+		if ( ! s.crossDomain ) {
+			s.crossDomain = !!(
+					parts &&
+					( parts[ 1 ] && parts[ 1 ] != loc.protocol ||
+						parts[ 2 ] != loc.hostname ||
+						( parts[ 3 ] || 80 ) != ( loc.port || 80 ) )
+			);
+		}
 
 		// Convert data if not already a string
 		if ( s.data && s.processData && typeof s.data != "string" ) {
@@ -533,7 +536,7 @@ jQuery.extend({
 		}
 
 		// Get transport
-		transport = jQuery.ajax.prefilter( s ).transport( s );
+		transport = jQuery.ajax.prefilter( s , options ).transport( s );
 
 		// Watch for a new set of requests
 		if ( s.global && jQuery.active++ === 0 ) {