Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-30 10:40:27 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4793 : KiChjang/servo/xhr-cred-check, r=Manishearth

Browse source 
Fixes #4665
This commit is contained in:
bors-servo 2015-02-02 08:57:53 -07:00
commit 755adf0dde
4 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/webidls/XMLHttpRequest.webidl
View file

@ -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]

17
components/script/dom/xmlhttprequest.rs
View file

@ -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) {
self.with_credentials.set(with_credentials);
// 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)