Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16311 - nox:data-method, r=KiChjang

Browse source 
Do not return an error for non-GET data: requests (fixes #13293)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16311)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-08 23:17:26 -05:00 • committed by GitHub
commit 3a5ed1797f
2 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/net/fetch/methods.rs
View file

@ -395,18 +395,14 @@ fn basic_fetch(request: &mut Request,
},
"data" => {
if request.method == Method::Get {
match decode(&url) {
Ok((mime, bytes)) => {
let mut response = Response::new(url);
*response.body.lock().unwrap() = ResponseBody::Done(bytes);
response.headers.set(ContentType(mime));
response
},
Err(_) => Response::network_error(NetworkError::Internal("Decoding data URL failed".into()))
}
} else {
Response::network_error(NetworkError::Internal("Unexpected method for data".into()))
match decode(&url) {
Ok((mime, bytes)) => {
let mut response = Response::new(url);
*response.body.lock().unwrap() = ResponseBody::Done(bytes);
response.headers.set(ContentType(mime));
response
},
Err(_) => Response::network_error(NetworkError::Internal("Decoding data URL failed".into()))
}
},