actix/examples
1
0
Fork 0
mirror of https://github.com/actix/examples synced 2025-06-26 09:17:41 +02:00
Code Issues Releases Wiki Activity

upgrade example to actix-web 0.7

Browse Source
This commit is contained in:
Nikolay Kim
2018-07-16 12:36:53 +06:00
parent 0b52c7850e
commit 2cc1b23761
57 changed files with 913 additions and 693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
http-proxy/Cargo.toml
View File

@ -15,5 +15,7 @@ path = "src/server.rs"
[dependencies]
env_logger = "0.5"
futures = "0.1"
actix = "0.5"
actix-web = { version = "^0.6", features=["alpn"] }
actix = "0.7"
#actix-web = "^0.7"
actix-web = { git = "https://github.com/actix/actix-web.git" }

6
http-proxy/src/main.rs
View File

@ -10,7 +10,7 @@ use actix_web::{
use futures::{Future, Stream};
/// Stream client request response and then send body to a server response
fn index(_req: HttpRequest) -> Box<Future<Item = HttpResponse, Error = Error>> {
fn index(_req: &HttpRequest) -> Box<Future<Item = HttpResponse, Error = Error>> {
client::ClientRequest::get("http://127.0.0.1:8081/")
.finish().unwrap()
.send()
@ -25,7 +25,7 @@ fn index(_req: HttpRequest) -> Box<Future<Item = HttpResponse, Error = Error>> {
}
/// streaming client request to a streaming server response
fn streaming(_req: HttpRequest) -> Box<Future<Item = HttpResponse, Error = Error>> {
fn streaming(_req: &HttpRequest) -> Box<Future<Item = HttpResponse, Error = Error>> {
// send client request
client::ClientRequest::get("https://www.rust-lang.org/en-US/")
.finish().unwrap()
@ -35,7 +35,7 @@ fn streaming(_req: HttpRequest) -> Box<Future<Item = HttpResponse, Error = Error
Ok(HttpResponse::Ok()
// read one chunk from client response and send this chunk to a server response
// .from_err() converts PayloadError to an Error
.body(Body::Streaming(Box::new(resp.from_err()))))
.body(Body::Streaming(Box::new(resp.payload().from_err()))))
})
.responder()
}

2
http-proxy/src/server.rs
View File

@ -6,7 +6,7 @@ extern crate futures;
use actix_web::*;
use futures::Future;
fn index(req: HttpRequest) -> FutureResponse<HttpResponse> {
fn index(req: &HttpRequest) -> FutureResponse<HttpResponse> {
req.body()
.from_err()
.map(|bytes| HttpResponse::Ok().body(bytes))