Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add native tls support for actix_tls::connect module #295

Merged
merged 6 commits into from
Mar 27, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename actix_tls::accept::nativetls module to native_tls
  • Loading branch information
fakeshadow authored and robjtede committed Mar 26, 2021
commit bb8323081f00e012de3c0fb3138513399b20d24d
3 changes: 2 additions & 1 deletion actix-tls/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
generation failed instead of panic. [#296]
* Remove `connect::ssl::openssl::OpensslConnectServiceFactory`. [#297]
* Remove `connect::ssl::openssl::OpensslConnectService`. [#297]
* Add `connect::ssl::nativetls` module for native tls support. [#295]
* Add `connect::ssl::native_tls` module for native tls support. [#295]
* Rename `accept::{nativetls => native_tls}`. [#295]

[#295]: https://github.com/actix/actix-net/pull/295
[#296]: https://github.com/actix/actix-net/pull/296
Expand Down
2 changes: 1 addition & 1 deletion actix-tls/src/accept/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ pub mod openssl;
pub mod rustls;

#[cfg(feature = "native-tls")]
pub mod nativetls;
pub mod native_tls;

pub(crate) static MAX_CONN: AtomicUsize = AtomicUsize::new(256);

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion actix-tls/src/connect/ssl/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ pub mod openssl;
pub mod rustls;

#[cfg(feature = "native-tls")]
pub mod nativetls;
pub mod native_tls;