forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reset pending push promises if user drops all refs (#199)

Browse Source
This commit is contained in:
Sean McArthur
2017-12-20 16:50:20 -08:00
committed by GitHub
parent 10d8ed7429
commit a89401dd91
4 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/proto/streams/streams.rs
View File

@@ -909,16 +909,29 @@ fn drop_stream_ref(inner: &Mutex<Inner>, key: store::Key) {
let actions = &mut me.actions;
me.counts.transition(stream, |counts, mut stream| {
if stream.is_canceled_interest() {
actions.send.schedule_cancel(
&mut stream,
&mut actions.task);
actions.recv.enqueue_reset_expiration(stream, counts);
me.counts.transition(stream, |counts, stream| {
maybe_cancel(stream, actions, counts);
if stream.ref_count == 0 {
let mut ppp = stream.pending_push_promises.take();
while let Some(promise) = ppp.pop(stream.store_mut()) {
counts.transition(promise, |counts, stream| {
maybe_cancel(stream, actions, counts);
});
}
}
});
}
fn maybe_cancel(stream: &mut store::Ptr, actions: &mut Actions, counts: &mut Counts) {
if stream.is_canceled_interest() {
actions.send.schedule_cancel(
stream,
&mut actions.task);
actions.recv.enqueue_reset_expiration(stream, counts);
}
}
// ===== impl SendBuffer =====
impl<B> SendBuffer<B> {