actix/actix-net
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-net synced 2024-11-24 01:11:07 +01:00
Code Issues Releases Wiki Activity

dedupe tls changelog

Browse Source
This commit is contained in:
Rob Ede 2021-12-04 19:51:33 +00:00
parent 183bcf6ae3
commit 07e3b19461
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
2 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actix-codec/src/framed.rs
View File

@ -1,10 +1,14 @@
use std::pin::Pin; use std::{
use std::task::{Context, Poll}; fmt, io,
use std::{fmt, io}; pin::Pin,
task::{Context, Poll},
};
use bitflags::bitflags;
use bytes::{Buf, BytesMut}; use bytes::{Buf, BytesMut};
use futures_core::{ready, Stream}; use futures_core::{ready, Stream};
use futures_sink::Sink; use futures_sink::Sink;
use pin_project_lite::pin_project;
use crate::{AsyncRead, AsyncWrite, Decoder, Encoder}; use crate::{AsyncRead, AsyncWrite, Decoder, Encoder};
@ -13,14 +17,14 @@ const LW: usize = 1024;
/// High-water mark /// High-water mark
const HW: usize = 8 * 1024; const HW: usize = 8 * 1024;
bitflags::bitflags! { bitflags! {
struct Flags: u8 { struct Flags: u8 {
const EOF = 0b0001; const EOF = 0b0001;
const READABLE = 0b0010; const READABLE = 0b0010;
} }
} }
pin_project_lite::pin_project! { pin_project! {
/// A unified `Stream` and `Sink` interface to an underlying I/O object, using the `Encoder` and /// A unified `Stream` and `Sink` interface to an underlying I/O object, using the `Encoder` and
/// `Decoder` traits to encode and decode frames. /// `Decoder` traits to encode and decode frames.
/// ///

30
actix-tls/CHANGES.md
View File

@ -38,36 +38,6 @@
[#423]: https://github.com/actix/actix-net/pull/423 [#423]: https://github.com/actix/actix-net/pull/423
### Added
* Derive `Debug` for `connect::Connection`. [#422]
* Implement `Display` for `accept::TlsError`. [#422]
* Implement `Error` for `accept::TlsError` where both types also implement `Error`. [#422]
* Implement `Default` for `connect::Resolver`. [#422]
* Implement `Error` for `connect::ConnectError`. [#422]
### Changed
* The crate's default features flags no longer include `uri`. [#422]
* Useful re-exports from underlying TLS crates are exposed in a `reexports` modules in all acceptors and connectors.
* Convert `connect::ResolverService` from enum to struct. [#422]
* Make `ConnectAddrsIter` private. [#422]
* Rename `accept::native_tls::{NativeTlsAcceptorService => AcceptorService}`. [#422]
* Rename `connect::{Address => Host}` trait. [#422]
* Rename method `connect::Connection::{host => hostname}`. [#422]
* Rename struct `connect::{Connect => ConnectInfo}`. [#422]
* Rename struct `connect::{ConnectService => ConnectorService}`. [#422]
* Rename struct `connect::{ConnectServiceFactory => Connector}`. [#422]
* Rename TLS acceptor service future types and hide from docs. [#422]
* Unbox some service futures types. [#422]
* Inline modules in `connect::tls` to `connect` module. [#422]
### Removed
* Remove `connect::{new_connector, new_connector_factory, default_connector, default_connector_factory}` methods. [#422]
* Remove `connect::native_tls::Connector::service` method. [#422]
* Remove redundant `connect::Connection::from_parts` method. [#422]
[#422]: https://github.com/actix/actix-net/pull/422
## 3.0.0-beta.9 - 2021-11-22 ## 3.0.0-beta.9 - 2021-11-22
* Add configurable timeout for accepting TLS connection. [#393] * Add configurable timeout for accepting TLS connection. [#393]
* Added `TlsError::Timeout` variant. [#393] * Added `TlsError::Timeout` variant. [#393]