servo: Merge #4793 - Added error checking on XMLHttpRequest::setWithCredentials (from KiChjang:xhr-cred-check); r=Manishearth

Fixes #4665

Source-Repo: https://github.com/servo/servo
Source-Revision: 755adf0ddefb060007c0319655f994445aea4709
This commit is contained in:
Keith Yeung 2015-02-02 08:57:53 -07:00
Родитель f638baf1e4
Коммит 0bdad32b66
2 изменённых файлов: 16 добавлений и 2 удалений

Просмотреть файл

@ -50,6 +50,7 @@ interface XMLHttpRequest : XMLHttpRequestEventTarget {
void setRequestHeader(ByteString name, ByteString value);
[SetterThrows]
attribute unsigned long timeout;
[SetterThrows]
attribute boolean withCredentials;
readonly attribute XMLHttpRequestUpload upload;
[Throws]

Просмотреть файл

@ -489,8 +489,21 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
fn WithCredentials(self) -> bool {
self.with_credentials.get()
}
fn SetWithCredentials(self, with_credentials: bool) {
// Spec for SetWithCredentials: https://xhr.spec.whatwg.org/#dom-xmlhttprequest-withcredentials
fn SetWithCredentials(self, with_credentials: bool) -> ErrorResult {
match self.ready_state.get() {
XMLHttpRequestState::HeadersReceived |
XMLHttpRequestState::Loading |
XMLHttpRequestState::XHRDone => Err(InvalidState),
_ if self.send_flag.get() => Err(InvalidState),
_ => match self.global.root() {
GlobalRoot::Window(_) if self.sync.get() => Err(InvalidAccess),
_ => {
self.with_credentials.set(with_credentials);
Ok(())
},
},
}
}
fn Upload(self) -> Temporary<XMLHttpRequestUpload> {
Temporary::new(self.upload)