mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-03 21:07:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Release empty buffers (#166)

Browse source 
* Release empty buffers
This commit is contained in:
Nikolay Kim 2023-01-25 23:38:00 +06:00 • committed by GitHub
parent 0d5cd049b1
commit 63881e40f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 44 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-tls/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes
## [0.2.3] - 2023-01-25
* Fix double buf cleanup
## [0.2.2] - 2023-01-24
* Update ntex-io to 0.2.2

2
ntex-tls/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-tls"
version = "0.2.2"
version = "0.2.3"
authors = ["ntex contributors <team@ntex.rs>"]
description = "An implementation of SSL streams for ntex backed by OpenSSL"
keywords = ["network", "framework", "async", "futures"]

10
ntex-tls/src/openssl/mod.rs
View file

@ -53,8 +53,7 @@ impl io::Read for IoInner {
impl io::Write for IoInner {
fn write(&mut self, src: &[u8]) -> io::Result<usize> {
let mut buf = if let Some(mut buf) = self.destination.take() {
buf.reserve(src.len());
let mut buf = if let Some(buf) = self.destination.take() {
buf
} else {
BytesVec::with_capacity_in(src.len(), self.pool)
@ -216,15 +215,10 @@ impl FilterLayer for SslFilter {
continue;
}
Err(e) => {
if !src.is_empty() {
buf.set_src(Some(src));
}
buf.set_src(Some(src));
self.unset_buffers(buf);
return match e.code() {
ssl::ErrorCode::WANT_READ | ssl::ErrorCode::WANT_WRITE => {
buf.set_dst(
self.inner.borrow_mut().get_mut().destination.take(),
);
Ok(())
}
_ => Err(map_to_ioerr(e)),

4
ntex-tls/src/rustls/client.rs
View file

@ -107,9 +107,7 @@ impl FilterLayer for TlsClientFilter {
}
}
if !src.is_empty() {
buf.set_src(Some(src));
}
buf.set_src(Some(src));
Ok(())
} else {
Ok(())

4
ntex-tls/src/rustls/server.rs
View file

@ -114,9 +114,7 @@ impl FilterLayer for TlsServerFilter {
}
}
if !src.is_empty() {
buf.set_src(Some(src));
}
buf.set_src(Some(src));
}
Ok(())
}