]> source.dussan.org Git - jquery.git/commitdiff
Fixes crossDomain test so that it assumes port to be 80 for http and 443 for https...
authorjaubourg <j@ubourg.net>
Wed, 19 Jan 2011 17:35:40 +0000 (18:35 +0100)
committerjaubourg <j@ubourg.net>
Wed, 19 Jan 2011 17:35:40 +0000 (18:35 +0100)
src/ajax.js

index e5fb5c4bcc123236db88acf62df2424e4e21a0e3..be31fe32039e088aefaf7b7a6709e5935677d7db 100644 (file)
@@ -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 ) ) )
                        );
                }