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

Increment stream window capacity when sending window update (#67)

Browse Source
This commit is contained in:
Oliver Gould
2017-09-08 12:24:06 -07:00
committed by Carl Lerche
parent c47717204c
commit 17bebe719a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/proto/streams/recv.rs
View File

@@ -525,7 +525,7 @@ impl<B, P> Recv<B, P>
try_ready!(dst.poll_ready()); try_ready!(dst.poll_ready());
// Get the next stream // Get the next stream
let stream = match self.pending_window_updates.pop(store) { let mut stream = match self.pending_window_updates.pop(store) {
Some(stream) => stream, Some(stream) => stream,
None => return Ok(().into()), None => return Ok(().into()),
}; };
@@ -543,6 +543,9 @@ impl<B, P> Recv<B, P>
// Buffer it // Buffer it
dst.buffer(frame.into()).ok().expect("invalid WINDOW_UPDATE frame"); dst.buffer(frame.into()).ok().expect("invalid WINDOW_UPDATE frame");
// Update flow control
stream.recv_flow.inc_window(incr).ok().expect("unexpected flow control state");
} }
} }
} }

21
tests/flow_control.rs
View File

@@ -54,7 +54,7 @@ fn send_data_without_requesting_capacity() {
fn release_capacity_sends_window_update() { fn release_capacity_sends_window_update() {
let _ = ::env_logger::init(); let _ = ::env_logger::init();
let payload = vec![0u8; 65_535]; let payload = vec![0u8; 16_384];
let (io, srv) = mock::new(); let (io, srv) = mock::new();
@@ -69,19 +69,16 @@ fn release_capacity_sends_window_update() {
frames::headers(1) frames::headers(1)
.response(200) .response(200)
) )
.send_frame(frames::data(1, &payload[0..16_384])) .send_frame(frames::data(1, &payload[..]))
.send_frame(frames::data(1, &payload[16_384..16_384 * 2])) .send_frame(frames::data(1, &payload[..]))
.send_frame(frames::data(1, &payload[16_384 * 2..16_384 * 3])) .send_frame(frames::data(1, &payload[..]))
.recv_frame( .recv_frame(
frames::window_update(0, 32_768) frames::window_update(0, 32_768)
) )
.recv_frame( .recv_frame(
frames::window_update(1, 32_768) frames::window_update(1, 32_768)
) )
.send_frame( .send_frame(frames::data(1, &payload[..]).eos())
frames::data(1, &payload[16_384 * 3..])
.eos()
)
// gotta end the connection // gotta end the connection
.map(drop); .map(drop);
@@ -103,21 +100,21 @@ fn release_capacity_sends_window_update() {
// read some body to use up window size to below half // read some body to use up window size to below half
.and_then(|(buf, body)| { .and_then(|(buf, body)| {
assert_eq!(buf.unwrap().len(), 16_384); assert_eq!(buf.unwrap().len(), payload.len());
body.into_future().unwrap() body.into_future().unwrap()
}) })
.and_then(|(buf, body)| { .and_then(|(buf, body)| {
assert_eq!(buf.unwrap().len(), 16_384); assert_eq!(buf.unwrap().len(), payload.len());
body.into_future().unwrap() body.into_future().unwrap()
}) })
.and_then(|(buf, mut body)| { .and_then(|(buf, mut body)| {
let buf = buf.unwrap(); let buf = buf.unwrap();
assert_eq!(buf.len(), 16_384); assert_eq!(buf.len(), payload.len());
body.release_capacity(buf.len() * 2).unwrap(); body.release_capacity(buf.len() * 2).unwrap();
body.into_future().unwrap() body.into_future().unwrap()
}) })
.and_then(|(buf, _)| { .and_then(|(buf, _)| {
assert_eq!(buf.unwrap().len(), 16_383); assert_eq!(buf.unwrap().len(), payload.len());
Ok(()) Ok(())
}); });
h2.unwrap().join(req) h2.unwrap().join(req)