Skip to content
Permalink
Browse files

Fixes crossDomain test so that it assumes port to be 80 for http and …

…443 for https when it is not provided.
  • Loading branch information
jaubourg committed Jan 19, 2011
1 parent 1cecfa1 commit 7d89d3c07233f77437a0acf77b1adf7f2c17989f
Showing with 4 additions and 2 deletions.
  1. +4 −2 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 ) ) )
);
}

0 comments on commit 7d89d3c

Please sign in to comment.
You can’t perform that action at this time.