From: jaubourg <j@ubourg.net>
Date: Wed, 19 Jan 2011 17:35:40 +0000 (+0100)
Subject: Fixes crossDomain test so that it assumes port to be 80 for http and 443 for https... 
X-Git-Tag: 1.5rc1~30
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7d89d3c07233f77437a0acf77b1adf7f2c17989f;p=jquery.git

Fixes crossDomain test so that it assumes port to be 80 for http and 443 for https when it is not provided.
---

diff --git a/src/ajax.js b/src/ajax.js
index e5fb5c4bc..be31fe320 100644
--- a/src/ajax.js
+++ b/src/ajax.js
@@ -317,6 +317,7 @@ jQuery.extend({
 			timeoutTimer,
 			// Cross-domain detection vars
 			loc = document.location,
+			protocol = loc.protocol || "http:",
 			parts,
 			// The jXHR state
 			state = 0,
@@ -629,9 +630,10 @@ jQuery.extend({
 			parts = rurl.exec( s.url.toLowerCase() );
 			s.crossDomain = !!(
 					parts &&
-					( parts[ 1 ] && parts[ 1 ] != loc.protocol ||
+					( parts[ 1 ] && parts[ 1 ] != protocol ||
 						parts[ 2 ] != loc.hostname ||
-						( parts[ 3 ] || 80 ) != ( loc.port || 80 ) )
+						( parts[ 3 ] || ( ( parts[ 1 ] || protocol ) === "http:" ? 80 : 443 ) )
+							!= ( loc.port || ( protocol === "http:" ? 80 : 443 ) ) )
 			);
 		}