Skip to content

Commit

Permalink
Fix stuff in fetch crate
Browse files Browse the repository at this point in the history
  • Loading branch information
Manishearth committed Aug 3, 2014
1 parent e678943 commit 7a2627f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 18 deletions.
27 changes: 13 additions & 14 deletions src/components/net/fetch/request.rs
Expand Up @@ -32,25 +32,24 @@ pub enum Referer {

/// A [request mode](http://fetch.spec.whatwg.org/#concept-request-mode)
pub enum RequestMode {
SameOrigin, // same-origin
NoCORS, // No CORS
CORSMode, // CORS
ForcedPreflightMode // CORS-with-forced-preflight
SameOrigin,
NoCORS,
CORSMode,
ForcedPreflightMode
}

/// Request [credentials mode](http://fetch.spec.whatwg.org/#concept-request-credentials-mode)
pub enum CredentialsMode {
Omit, // omit
CredentialsSameOrigin, // same-origin
Include // include
Omit,
CredentialsSameOrigin,
Include
}


// [Response tainting](http://fetch.spec.whatwg.org/#concept-request-response-tainting)
/// [Response tainting](http://fetch.spec.whatwg.org/#concept-request-response-tainting)
pub enum ResponseTainting {
Basic, // basic
CORSTainting, // CORS
Opaque // Opaque
Basic,
CORSTainting,
Opaque
}

/// A [Request](http://fetch.spec.whatwg.org/#requests) as defined by the Fetch spec
Expand Down Expand Up @@ -104,6 +103,6 @@ impl Request {
manual_redirect: false,
redirect_count: 0,
response_tainting: Basic
}
}
}
}
}
10 changes: 6 additions & 4 deletions src/components/net/fetch/response.rs
Expand Up @@ -10,7 +10,7 @@ use http::headers::response::HeaderCollection;
use std::ascii::OwnedStrAsciiExt;

// [Response type](http://fetch.spec.whatwg.org/#concept-response-type)
#[deriving(Clone)]
#[deriving(Clone, PartialEq)]
pub enum ResponseType {
Basic,
CORS,
Expand All @@ -37,7 +37,7 @@ pub struct Response {
pub headers: HeaderCollection,
pub body: Option<Vec<u8>>,
/// [Internal response](http://fetch.spec.whatwg.org/#concept-internal-response), only used if the Response is a filtered response
pub internal_response: Option<Box<Response>>,
pub internal_response: Option<Box<Response>>,
}

impl Response {
Expand All @@ -60,9 +60,11 @@ impl Response {
}
}

/// Convert to a filtered response, of type `filter_type`
/// Convert to a filtered response, of type `filter_type`.
/// Do not use with type Error or Default
pub fn to_filtered(self, filter_type: ResponseType) -> Response {
assert!(filter_type != Error);
assert!(filter_type != Default);
if self.is_network_error() {
return self;
}
Expand Down Expand Up @@ -103,4 +105,4 @@ impl Response {
}
response
}
}
}

0 comments on commit 7a2627f

Please sign in to comment.