From 1d0ccbbf1358ece4bcf7a941a9b31619838e44c6 Mon Sep 17 00:00:00 2001 From: Kegan Myers Date: Thu, 17 Apr 2014 23:15:48 -0500 Subject: [PATCH] Fix logical error in origin check --- lib/Typertext/Http/HttpUrl.ts | 2 +- lib/Typertext/Transport/TransportChooser.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Typertext/Http/HttpUrl.ts b/lib/Typertext/Http/HttpUrl.ts index 2479389..4eeb0ad 100644 --- a/lib/Typertext/Http/HttpUrl.ts +++ b/lib/Typertext/Http/HttpUrl.ts @@ -199,7 +199,7 @@ module Typertext.Http { * * @returns {boolean} */ - public CrossOriginCheck(url:HttpUrl):boolean { + public SameOriginCheck(url:HttpUrl):boolean { return (this.domain === url.GetDomain() && this.port === url.GetPort() && this.protocol === url.GetProtocol()); } } diff --git a/lib/Typertext/Transport/TransportChooser.ts b/lib/Typertext/Transport/TransportChooser.ts index 596a9c7..bf5205f 100644 --- a/lib/Typertext/Transport/TransportChooser.ts +++ b/lib/Typertext/Transport/TransportChooser.ts @@ -32,8 +32,8 @@ module Typertext.Transport { var ieLte9 = (ieTestDiv.getElementsByTagName("i").length === 1); var origin = HttpUrl.FromUrl(window.location.href); - //If this is a CORS request in a modern browser - if (!origin.CrossOriginCheck(origin) || !ieLte9) { + //If this is a standard request, or a CORS request in a modern browser + if (origin.SameOriginCheck(origin) || !ieLte9) { //Just use a standard XHR request return XHR; }