Index: Source/core/xmlhttprequest/XMLHttpRequest.cpp |
diff --git a/Source/core/xmlhttprequest/XMLHttpRequest.cpp b/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
index f10abe0c2f6232c1fa2d7783f2980af4b9082cee..5a64de7d5b1bd2074ec484b60802543000778683 100644 |
--- a/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
+++ b/Source/core/xmlhttprequest/XMLHttpRequest.cpp |
@@ -687,11 +687,16 @@ void XMLHttpRequest::setWithCredentials(bool value, ExceptionState& exceptionSta |
m_includeCredentials = value; |
} |
-void XMLHttpRequest::open(const AtomicString& method, const KURL& url, ExceptionState& exceptionState) |
+void XMLHttpRequest::open(const AtomicString& method, const AtomicString& url, ExceptionState& exceptionState) |
{ |
open(method, url, true, exceptionState); |
} |
+void XMLHttpRequest::open(const AtomicString& method, const AtomicString& urlString, bool async, ExceptionState& exceptionState) |
+{ |
+ open(method, executionContext()->completeURL(urlString), async, exceptionState); |
+} |
+ |
void XMLHttpRequest::open(const AtomicString& method, const KURL& url, bool async, ExceptionState& exceptionState) |
{ |
WTF_LOG(Network, "XMLHttpRequest %p open('%s', '%s', %d)", this, method.utf8().data(), url.elidedString().utf8().data(), async); |
@@ -763,17 +768,17 @@ void XMLHttpRequest::open(const AtomicString& method, const KURL& url, bool asyn |
m_state = OPENED; |
} |
-void XMLHttpRequest::open(const AtomicString& method, const KURL& url, bool async, const String& user, ExceptionState& exceptionState) |
+void XMLHttpRequest::open(const AtomicString& method, const AtomicString& urlString, bool async, const String& user, ExceptionState& exceptionState) |
{ |
- KURL urlWithCredentials(url); |
+ KURL urlWithCredentials(executionContext()->completeURL(urlString)); |
urlWithCredentials.setUser(user); |
open(method, urlWithCredentials, async, exceptionState); |
} |
-void XMLHttpRequest::open(const AtomicString& method, const KURL& url, bool async, const String& user, const String& password, ExceptionState& exceptionState) |
+void XMLHttpRequest::open(const AtomicString& method, const AtomicString& urlString, bool async, const String& user, const String& password, ExceptionState& exceptionState) |
{ |
- KURL urlWithCredentials(url); |
+ KURL urlWithCredentials(executionContext()->completeURL(urlString)); |
urlWithCredentials.setUser(user); |
urlWithCredentials.setPass(password); |