Browse Source

bump ver

master
Nikolay Kim 7 months ago
parent
commit
8b8a9a995d
13 changed files with 31 additions and 27 deletions
  1. +1
    -1
      CHANGES.md
  2. +1
    -1
      Cargo.toml
  3. +1
    -1
      actix-cors/Cargo.toml
  4. +3
    -3
      actix-files/Cargo.toml
  5. +2
    -2
      actix-identity/Cargo.toml
  6. +1
    -1
      actix-multipart/Cargo.toml
  7. +1
    -1
      actix-session/Cargo.toml
  8. +4
    -4
      actix-web-actors/Cargo.toml
  9. +1
    -1
      actix-web-codegen/Cargo.toml
  10. +2
    -2
      awc/Cargo.toml
  11. +9
    -6
      awc/tests/test_rustls_client.rs
  12. +3
    -2
      src/app.rs
  13. +2
    -2
      test-server/Cargo.toml

+ 1
- 1
CHANGES.md View File

@@ -1,6 +1,6 @@
# Changes

## [2.0.0] - 2019-12-xx
## [2.0.0-rc] - 2019-12-20

### Changed



+ 1
- 1
Cargo.toml View File

@@ -1,6 +1,6 @@
[package]
name = "actix-web"
version = "2.0.0-alpha.6"
version = "2.0.0-rc"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
readme = "README.md"


+ 1
- 1
actix-cors/Cargo.toml View File

@@ -17,7 +17,7 @@ name = "actix_cors"
path = "src/lib.rs"

[dependencies]
actix-web = "2.0.0-alpha.5"
actix-web = "2.0.0-rc"
actix-service = "1.0.0"
derive_more = "0.99.2"
futures = "0.3.1"


+ 3
- 3
actix-files/Cargo.toml View File

@@ -18,8 +18,8 @@ name = "actix_files"
path = "src/lib.rs"

[dependencies]
actix-web = { version = "2.0.0-alpha.6", default-features = false }
actix-http = "1.0.0"
actix-web = { version = "2.0.0-rc", default-features = false }
actix-http = "1.0.1"
actix-service = "1.0.0"
bitflags = "1"
bytes = "0.5.3"
@@ -33,4 +33,4 @@ v_htmlescape = "0.4"

[dev-dependencies]
actix-rt = "1.0.0"
actix-web = { version = "2.0.0-alpha.6", features=["openssl"] }
actix-web = { version = "2.0.0-rc", features=["openssl"] }

+ 2
- 2
actix-identity/Cargo.toml View File

@@ -17,7 +17,7 @@ name = "actix_identity"
path = "src/lib.rs"

[dependencies]
actix-web = { version = "2.0.0-alpha.5", default-features = false, features = ["secure-cookies"] }
actix-web = { version = "2.0.0-rc", default-features = false, features = ["secure-cookies"] }
actix-service = "1.0.0"
futures = "0.3.1"
serde = "1.0"
@@ -26,5 +26,5 @@ time = "0.1.42"

[dev-dependencies]
actix-rt = "1.0.0"
actix-http = "1.0.0"
actix-http = "1.0.1"
bytes = "0.5.3"

+ 1
- 1
actix-multipart/Cargo.toml View File

@@ -16,7 +16,7 @@ name = "actix_multipart"
path = "src/lib.rs"

[dependencies]
actix-web = { version = "2.0.0-alpha.5", default-features = false }
actix-web = { version = "2.0.0-rc", default-features = false }
actix-service = "1.0.0"
actix-utils = "1.0.3"
bytes = "0.5.3"


+ 1
- 1
actix-session/Cargo.toml View File

@@ -22,7 +22,7 @@ default = ["cookie-session"]
cookie-session = ["actix-web/secure-cookies"]

[dependencies]
actix-web = "2.0.0-alpha.5"
actix-web = "2.0.0-rc"
actix-service = "1.0.0"
bytes = "0.5.3"
derive_more = "0.99.2"


+ 4
- 4
actix-web-actors/Cargo.toml View File

@@ -1,6 +1,6 @@
[package]
name = "actix-web-actors"
version = "2.0.0-alpha.1"
version = "2.0.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix actors support for actix web framework."
readme = "README.md"
@@ -16,9 +16,9 @@ name = "actix_web_actors"
path = "src/lib.rs"

[dependencies]
actix = "0.9.0-alpha.1"
actix-web = "2.0.0-alpha.5"
actix-http = "1.0.0"
actix = "0.9.0"
actix-web = "2.0.0-rc"
actix-http = "1.0.1"
actix-codec = "0.2.0"
bytes = "0.5.2"
futures = "0.3.1"


+ 1
- 1
actix-web-codegen/Cargo.toml View File

@@ -18,5 +18,5 @@ proc-macro2 = "^1"

[dev-dependencies]
actix-rt = { version = "1.0.0" }
actix-web = { version = "2.0.0-alpha.4" }
actix-web = { version = "2.0.0-rc" }
futures = { version = "0.3.1" }

+ 2
- 2
awc/Cargo.toml View File

@@ -55,8 +55,8 @@ rust-tls = { version = "0.16.0", package="rustls", optional = true, features = [

[dev-dependencies]
actix-connect = { version = "1.0.1", features=["openssl"] }
actix-web = { version = "2.0.0-alpha.5", features=["openssl"] }
actix-http = { version = "1.0.0", features=["openssl"] }
actix-web = { version = "2.0.0-rc", features=["openssl"] }
actix-http = { version = "1.0.1", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-utils = "1.0.3"
actix-server = "1.0.0"


+ 9
- 6
awc/tests/test_rustls_client.rs View File

@@ -4,9 +4,9 @@ use std::sync::Arc;

use actix_http::HttpService;
use actix_http_test::test_server;
use actix_service::{map_config, pipeline_factory, ServiceFactory, IntoServiceFactory};
use actix_service::{map_config, pipeline_factory, IntoServiceFactory, ServiceFactory};
use actix_web::http::Version;
use actix_web::{web, App, HttpResponse, dev::AppConfig};
use actix_web::{dev::AppConfig, web, App, HttpResponse};
use futures::future::ok;
use open_ssl::ssl::{SslAcceptor, SslFiletype, SslMethod, SslVerifyMode};
use rust_tls::ClientConfig;
@@ -62,10 +62,13 @@ async fn _test_connection_reuse_h2() {
})
.and_then(
HttpService::build()
.h2(map_config(App::new()
.service(web::resource("/").route(web::to(|| HttpResponse::Ok())))
.into_factory(),
|_| AppConfig::default(),
.h2(map_config(
App::new()
.service(
web::resource("/").route(web::to(|| HttpResponse::Ok())),
)
.into_factory(),
|_| AppConfig::default(),
))
.openssl(ssl_acceptor())
.map_err(|_| ()),


+ 3
- 2
src/app.rs View File

@@ -78,8 +78,9 @@ where
/// an application instance. Http server constructs an application
/// instance for each thread, thus application data must be constructed
/// multiple times. If you want to share data between different
/// threads, a shared object should be used, e.g. `Arc`. Application
/// data does not need to be `Send` or `Sync`.
/// threads, a shared object should be used, e.g. `Arc`. Internally `Data` type
/// uses `Arc` so data could be created outside of app factory and clones could
/// be stored via `App::app_data()` method.
///
/// ```rust
/// use std::cell::Cell;


+ 2
- 2
test-server/Cargo.toml View File

@@ -55,5 +55,5 @@ time = "0.1"
open-ssl = { version="0.10", package="openssl", optional = true }

[dev-dependencies]
actix-web = "2.0.0-alpha.5"
actix-http = "1.0.0"
actix-web = "2.0.0-rc"
actix-http = "1.0.1"

Loading…
Cancel
Save