mirrors/actix-web
1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-11-25 19:11:10 +00:00
Code Issues Projects Releases Wiki Activity

different ports

Browse source
This commit is contained in:
Nikolay Kim 2017-10-22 21:52:01 -07:00
parent 3adddc591d
commit f737a3eb3e
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Cargo.toml
View file

@ -20,6 +20,12 @@ codecov = { repository = "fafhrd91/actix-web", branch = "master", service = "git
name = "actix_web" name = "actix_web"
path = "src/lib.rs" path = "src/lib.rs"
[features]
default = []
# http/2
http2 = ["h2"]
[dependencies] [dependencies]
log = "0.3" log = "0.3"
time = "0.1" time = "0.1"
@ -40,10 +46,11 @@ futures = "0.1"
tokio-core = "0.1" tokio-core = "0.1"
tokio-io = "0.1" tokio-io = "0.1"
tokio-proto = "0.1" tokio-proto = "0.1"
h2 = { git = 'https://github.com/carllerche/h2', optional = true }
[dependencies.actix] [dependencies.actix]
#path = "../actix" #path = "../actix"
git = "https://github.com/fafhrd91/actix.git" git = "https://github.com/actix/actix.git"
#version = "0.2" #version = "0.2"
default-features = false default-features = false
features = [] features = []

2
examples/multipart/Cargo.toml
View file

@ -10,5 +10,5 @@ path = "src/main.rs"
[dependencies] [dependencies]
env_logger = "*" env_logger = "*"
# actix = "0.2" # actix = "0.2"
actix = { git = "https://github.com/fafhrd91/actix.git" } actix = { git = "https://github.com/actix/actix.git" }
actix-web = { path = "../../" } actix-web = { path = "../../" }

2
examples/websocket-chat/Cargo.toml
View file

@ -24,6 +24,6 @@ serde = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
actix = { git = "https://github.com/fafhrd91/actix.git" } actix = { git = "https://github.com/actix/actix.git" }
# actix = { path = "../../../actix" } # actix = { path = "../../../actix" }
actix-web = { path = "../../" } actix-web = { path = "../../" }

2
examples/websocket-chat/README.md
View file

@ -1,7 +1,7 @@
# Websocket chat example # Websocket chat example
This is extension of the This is extension of the
[actix chat example](https://github.com/fafhrd91/actix/tree/master/examples/chat) [actix chat example](https://github.com/actix/actix/tree/master/examples/chat)
Added features: Added features:

8
tests/test_server.rs
View file

@ -39,14 +39,14 @@ fn test_serve_incoming() {
let sys = System::new("test"); let sys = System::new("test");
let srv = create_server(); let srv = create_server();
let addr = net::SocketAddr::from_str("127.0.0.1:58906").unwrap(); let addr = net::SocketAddr::from_str("127.0.0.1:58903").unwrap();
let tcp = TcpListener::bind(&addr, Arbiter::handle()).unwrap(); let tcp = TcpListener::bind(&addr, Arbiter::handle()).unwrap();
srv.serve_incoming::<_, ()>(tcp.incoming()).unwrap(); srv.serve_incoming::<_, ()>(tcp.incoming()).unwrap();
sys.run(); sys.run();
}); });
assert!(reqwest::get("http://localhost:58906/").unwrap().status().is_success()); assert!(reqwest::get("http://localhost:58903/").unwrap().status().is_success());
} }
struct MiddlewareTest { struct MiddlewareTest {
@ -94,11 +94,11 @@ fn test_middlewares() {
httpcodes::HTTPOk httpcodes::HTTPOk
})) }))
.finish()]) .finish()])
.serve::<_, ()>("127.0.0.1:58903").unwrap(); .serve::<_, ()>("127.0.0.1:58904").unwrap();
sys.run(); sys.run();
}); });
assert!(reqwest::get("http://localhost:58903/").unwrap().status().is_success()); assert!(reqwest::get("http://localhost:58904/").unwrap().status().is_success());
assert_eq!(num1.load(Ordering::Relaxed), 1); assert_eq!(num1.load(Ordering::Relaxed), 1);
assert_eq!(num2.load(Ordering::Relaxed), 1); assert_eq!(num2.load(Ordering::Relaxed), 1);