Merge branch 'master' into master

This commit is contained in:
tom authored and GitHub committed 2022-07-18 14:25:33 +08:00
commit 6db3a2e85c
63 files changed
+1609 -717

No files matched your search

+1 -1
View File
@@ -492,7 +492,7 @@ impl Connection {
res = self.stream.next() => {
if let Some(res) = res {
last_recv_time = Instant::now();
timeout(SEND_TIMEOUT_OTHER, forward.send(res?.into())).await??;
timeout(SEND_TIMEOUT_OTHER, forward.send(res?)).await??;
} else {
bail!("Stream reset by the peer");
}