auto merge of #4254 : medopaw/servo/settimeout-on-sync-error, r=Manishearth

fix #4253
This commit is contained in:
bors-servo 2014-12-05 20:13:02 -07:00
commit 33836715a8
2 changed files with 1 additions and 6 deletions

View file

@ -460,7 +460,7 @@ impl<'a> XMLHttpRequestMethods for JSRef<'a, XMLHttpRequest> {
fn SetTimeout(self, timeout: u32) -> ErrorResult {
if self.sync.get() {
// FIXME: Not valid for a worker environment
Err(InvalidState)
Err(InvalidAccess)
} else {
self.timeout.set(timeout);
if self.send_flag.get() {