From dcb0a2b7fef335bb3695b06a9b68b7d771a4bb77 Mon Sep 17 00:00:00 2001 From: Mike Bishop Date: Sun, 29 Jan 2017 16:07:16 -0800 Subject: [PATCH] Remove connection-level flow control exclusion --- draft-ietf-quic-http.md | 3 +-- draft-ietf-quic-transport.md | 14 ++++---------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/draft-ietf-quic-http.md b/draft-ietf-quic-http.md index 9e923c52f9..a536e47132 100644 --- a/draft-ietf-quic-http.md +++ b/draft-ietf-quic-http.md @@ -198,8 +198,7 @@ This amounts to the second least-significant bit differentiating the two streams in a request. The lower-numbered stream is called the message control stream and carries -frames related to the request/response, including HEADERS. All request control -streams are exempt from connection-level flow control. The higher-numbered +frames related to the request/response, including HEADERS. The higher-numbered stream is the data stream and carries the request/response body with no additional framing. Note that a request or response without a body will cause this stream to be half-closed in the corresponding direction without diff --git a/draft-ietf-quic-transport.md b/draft-ietf-quic-transport.md index f2ec7ed75a..4ebb1ad9a9 100644 --- a/draft-ietf-quic-transport.md +++ b/draft-ietf-quic-transport.md @@ -1621,16 +1621,10 @@ as an ordered byte-stream. Data received out of order MUST be buffered for later delivery, as long as it is not in violation of the receiver's flow control limits. -An endpoint MUST NOT send any stream data without consulting the congestion -controller and the flow controller, with the following two exceptions. - -* The crypto handshake stream, Stream 1, MUST NOT be subject to congestion - control or connection-level flow control, but MUST be subject to stream-level - flow control. - -* An application MAY exclude specific stream IDs from connection-level flow - control. If so, these streams MUST NOT be subject to connection-level flow - control. +The crypto handshake stream, Stream 1, MUST NOT be subject to congestion control +or connection-level flow control, but MUST be subject to stream-level flow +control. An endpoint MUST NOT send data on any other stream without consulting +the congestion controller and the flow controller. Flow control is described in detail in {{flow-control}}, and congestion control is described in the companion document {{QUIC-RECOVERY}}.