berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Some small optimizations

This commit is contained in:
Omid Rad 2021-07-13 00:30:14 +02:00
parent 1cc4168c30
commit eced22d546
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
awc/src/middleware/redirect.rs
View File

@ -104,7 +104,7 @@ where
RedirectServiceFuture::Client { RedirectServiceFuture::Client {
fut, fut,
max_redirect_times, max_redirect_times,
uri: Some(uri.clone()), uri: Some(uri),
method: Some(method), method: Some(method),
headers: Some(headers), headers: Some(headers),
body: body_opt, body: body_opt,
@ -359,7 +359,7 @@ mod tests {
async fn test(req: HttpRequest, bytes: Bytes) -> HttpResponse { async fn test(req: HttpRequest, bytes: Bytes) -> HttpResponse {
let body = String::from_utf8(bytes.to_vec()).unwrap(); let body = String::from_utf8(bytes.to_vec()).unwrap();
if req.method() == Method::POST && body.len() > 0 { if req.method() == Method::POST && !body.is_empty() {
HttpResponse::Ok().finish() HttpResponse::Ok().finish()
} else { } else {
HttpResponse::InternalServerError().finish() HttpResponse::InternalServerError().finish()
@ -372,11 +372,7 @@ mod tests {
}); });
let client = ClientBuilder::new().finish(); let client = ClientBuilder::new().finish();
let res = client let res = client.post(srv.url("/")).send_body("Hello").await.unwrap();
.post(srv.url("/"))
.send_body(Body::from_slice("Hello".as_bytes()))
.await
.unwrap();
assert_eq!(res.status().as_u16(), 200); assert_eq!(res.status().as_u16(), 200);
} }
@ -393,7 +389,7 @@ mod tests {
let body = String::from_utf8(bytes.to_vec()).unwrap(); let body = String::from_utf8(bytes.to_vec()).unwrap();
if (req.method() == Method::GET || req.method() == Method::HEAD) if (req.method() == Method::GET || req.method() == Method::HEAD)
&& body.len() == 0 && body.is_empty()
{ {
HttpResponse::Ok().finish() HttpResponse::Ok().finish()
} else { } else {
@ -407,19 +403,10 @@ mod tests {
}); });
let client = ClientBuilder::new().finish(); let client = ClientBuilder::new().finish();
let res = client let res = client.post(srv.url("/")).send_body("Hello").await.unwrap();
.post(srv.url("/"))
.send_body(Body::from_slice("Hello".as_bytes()))
.await
.unwrap();
assert_eq!(res.status().as_u16(), 200); assert_eq!(res.status().as_u16(), 200);
let client = ClientBuilder::new().finish(); let res = client.head(srv.url("/")).send().await.unwrap();
let res = client
.head(srv.url("/"))
.send_body(Body::from_slice("Hello".as_bytes()))
.await
.unwrap();
assert_eq!(res.status().as_u16(), 200); assert_eq!(res.status().as_u16(), 200);
} }
@ -544,9 +531,6 @@ mod tests {
assert_eq!(res.status().as_u16(), 200); assert_eq!(res.status().as_u16(), 200);
// send a request to same origin, http://srv1/test1 then http://srv1/test2. So it should NOT remove any header // send a request to same origin, http://srv1/test1 then http://srv1/test2. So it should NOT remove any header
let client = ClientBuilder::new()
.header(header::AUTHORIZATION, "auth_key_value")
.finish();
let res = client.get(srv1.url("/test1")).send().await.unwrap(); let res = client.get(srv1.url("/test1")).send().await.unwrap();
assert_eq!(res.status().as_u16(), 200); assert_eq!(res.status().as_u16(), 200);
} }