Merge branch 'master' of https://github.com/quicwg/base-drafts into ecn

.circleci/config.yml

@@ -43,7 +43,10 @@ jobs:
       # Update editor's copy on gh-pages
       - run:
           name: "Update GitHub Pages"
-          command: "make gh-pages"
+          command: |
+            if [ "${CIRCLE_TAG#draft-}" == "${CIRCLE_TAG}" ]; then
+              make gh-pages
+            fi
 
       # For tagged builds, upload to the datatracker.
       - deploy:

.lint.py

@@ -16,7 +16,7 @@
 for inputfile in args.files:
     insideFigure = False
     beforeAbstract = True
-    with open(inputfile, 'U') as draft:
+    with open(inputfile, mode='rt', newline=None, encoding='utf-8') as draft:
         linecounter = 1
         lines = draft.readlines()
 

draft-ietf-quic-http.md

@@ -777,18 +777,13 @@ Settings which are integers use the QUIC variable-length integer encoding.
 
 #### Defined SETTINGS Parameters {#settings-parameters}
 
-The following settings are defined in HTTP/QUIC:
-
-  SETTINGS_HEADER_TABLE_SIZE (0x1):
-  : An integer with a maximum value of 2^30 - 1.  The default value is 4,096
-    bytes.
+The following setting is defined in HTTP/QUIC:
 
   SETTINGS_MAX_HEADER_LIST_SIZE (0x6):
   : An integer with a maximum value of 2^30 - 1.  The default value is
     unlimited.
 
-  SETTINGS_QPACK_BLOCKED_STREAMS (0x7):
-  : An integer with a maximum value of 2^16 - 1.  The default value is 100.
+Additional settings MAY be defined by extensions to HTTP/QUIC.
 
 #### Initial SETTINGS Values
 
@@ -1068,14 +1063,18 @@ HTTP_VERSION_FALLBACK (0x09):
   retry over HTTP/2.
 
 HTTP_WRONG_STREAM (0x0A):
-: A frame was received on stream where it is not permitted.
+: A frame was received on a stream where it is not permitted.
 
 HTTP_PUSH_LIMIT_EXCEEDED (0x0B):
 : A Push ID greater than the current maximum Push ID was referenced.
 
 HTTP_DUPLICATE_PUSH (0x0C):
 : A Push ID was referenced in two different stream headers.
 
+HTTP_GENERAL_PROTOCOL_ERROR (0x00FF):
+: Peer violated protocol requirements in a way which doesn't match a more
+  specific error code, or endpoint declines to use the more specific error code.
+
 HTTP_MALFORMED_FRAME (0x01XX):
 : An error in a specific frame type.  The frame type is included as the last
   octet of the error code.  For example, an error in a MAX_PUSH_ID frame would
@@ -1418,13 +1417,11 @@ The entries in the following table are registered by this document.
 |----------------------------|------|-------------------------|
 | Setting Name               | Code | Specification           |
 |----------------------------|:----:|-------------------------|
-| HEADER_TABLE_SIZE          | 0x1  | {{settings-parameters}} |
 | Reserved                   | 0x2  | N/A                     |
 | Reserved                   | 0x3  | N/A                     |
 | Reserved                   | 0x4  | N/A                     |
 | Reserved                   | 0x5  | N/A                     |
 | MAX_HEADER_LIST_SIZE       | 0x6  | {{settings-parameters}} |
-| QPACK_BLOCKED_STREAMS      | 0x7  | {{settings-parameters}} |
 |----------------------------|------|-------------------------|
 
 ## Error Codes {#iana-error-codes}
@@ -1478,18 +1475,16 @@ The entries in the following table are registered by this document.
 
 --- back
 
-# Contributors
-
-The original authors of this specification were Robbie Shade and Mike Warres.
-
-A substantial portion of Mike's contribution was supported by Microsoft during
-his employment there.
-
 # Change Log
 
 > **RFC Editor's Note:**  Please remove this section prior to publication of a
 > final version of this document.
 
+## Since draft-ietf-quic-http-11
+
+- Moved QPACK table updates and acknowledgments to dedicated streams (#1121,
+  #1122, #1238)
+
 ## Since draft-ietf-quic-http-10
 
 - Settings need to be remembered when attempting and accepting 0-RTT (#1157,
@@ -1573,3 +1568,12 @@ None.
 
 - Adopted as base for draft-ietf-quic-http
 - Updated authors/editors list
+
+# Acknowledgements
+{:numbered="false"}
+
+The original authors of this specification were Robbie Shade and Mike Warres.
+
+A substantial portion of Mike's contribution was supported by Microsoft during
+his employment there.
+