Merge remote-tracking branch 'origin/master' into goaway

draft-ietf-quic-http.md

@@ -327,8 +327,8 @@ frames add, remove, or change the dependency links between streams.
 
 HTTP/QUIC supports server push as described in {{!RFC7540}}. During connection
 establishment, the client indicates whether it is willing to receive server
-pushes via the SETTINGS_DISABLE_PUSH setting in the SETTINGS frame (see
-{{connection-establishment}}), which defaults to 1 (true).
+pushes via the SETTINGS_ENABLE_PUSH setting in the SETTINGS frame (see
+{{connection-establishment}}), which is disabled by default.
 
 As with server push for HTTP/2, the server initiates a server push by sending a
 PUSH_PROMISE frame containing the Stream ID of the stream to be pushed, as well
@@ -443,10 +443,16 @@ The PRIORITY frame payload has the following fields:
     {{!RFC7540}}, Section 5.3). Add one to the value to obtain a weight between
     1 and 256.
 
-A PRIORITY frame MUST have a payload length of nine octets.  A PRIORITY frame
-of any other length MUST be treated as a connection error of type
+A PRIORITY frame MAY identify a dependent stream with a stream ID of 0; as in
+{{!RFC7540}}, this makes the request dependent on the root of the dependency
+tree.  Stream ID 0 and stream ID 1 cannot be reprioritized; an attempt to
+reprioritize these stream MUST be treated as a connection error of type
 HTTP_MALFORMED_PRIORITY.
 
+The length of a PRIORITY frame is 9 octets.  A PRIORITY frame with any other
+length MUST be treated as a connection error of type HTTP_MALFORMED_PRIORITY.
+
+
 ### SETTINGS {#frame-settings}
 
 The SETTINGS frame (type=0x4) conveys configuration parameters that affect how
@@ -525,11 +531,11 @@ The following settings are defined in HTTP/QUIC:
   SETTINGS_HEADER_TABLE_SIZE (0x1):
   : An integer with a maximum value of 2^32 - 1.  This value MUST be zero.
 
-  SETTINGS_DISABLE_PUSH (0x2):
-  : Transmitted as a Boolean; replaces SETTINGS_ENABLE_PUSH
+  SETTINGS_ENABLE_PUSH (0x2):
+  : Transmitted as a Boolean
 
   SETTINGS_MAX_HEADER_LIST_SIZE (0x6):
-  : An integer with a maximum value of 2^32 - 1.
+  : An integer with a maximum value of 2^32 - 1
 
 #### Usage in 0-RTT
 
@@ -845,7 +851,7 @@ SETTINGS_HEADER_TABLE_SIZE:
 : See {{settings-parameters}}.
 
 SETTINGS_ENABLE_PUSH:
-: See SETTINGS_DISABLE_PUSH in {{settings-parameters}}.
+: See {{settings-parameters}}.
 
 SETTINGS_MAX_CONCURRENT_STREAMS:
 : QUIC controls the largest open stream ID as part of its flow control logic.
@@ -1000,7 +1006,7 @@ The entries in the following table are registered by this document.
   |---------------|------|-------------------------|
   | Frame Type    | Code | Specification           |
   |---------------|:----:|-------------------------|
-  | Reserved      | 0x0  | N/A                     |
+  | DATA          | 0x0  | {{frame-data}}          |
   | HEADERS       | 0x1  | {{frame-headers}}       |
   | PRIORITY      | 0x2  | {{frame-priority}}      |
   | Reserved      | 0x3  | N/A                     |
@@ -1044,7 +1050,7 @@ The entries in the following table are registered by this document.
 | Setting Name               | Code | Specification           |
 |----------------------------|:----:|-------------------------|
 | HEADER_TABLE_SIZE          | 0x1  | {{settings-parameters}} |
-| DISABLE_PUSH               | 0x2  | {{settings-parameters}} |
+| ENABLE_PUSH                | 0x2  | {{settings-parameters}} |
 | Reserved                   | 0x3  | N/A                     |
 | Reserved                   | 0x4  | N/A                     |
 | Reserved                   | 0x5  | N/A                     |
@@ -1117,6 +1123,7 @@ The original authors of this specification were Robbie Shade and Mike Warres.
 - Cite RFC 5234 (#404)
 - Return to a single stream per request (#245,#557)
 - Use separate frame type and settings registries from HTTP/2 (#81)
+- SETTINGS_ENABLE_PUSH instead of SETTINGS_DISABLE_PUSH (#477)
 - Restored GOAWAY (#696)
 
 ## Since draft-ietf-quic-http-03