diff --git a/draft-ietf-quic-http.md b/draft-ietf-quic-http.md index 451000519c..c9cfb13fa6 100644 --- a/draft-ietf-quic-http.md +++ b/draft-ietf-quic-http.md @@ -785,10 +785,9 @@ amount of data a server may commit to the pushed stream. If a promised server push is not needed by the client, the client SHOULD send a CANCEL_PUSH frame. If the push stream is already open or opens after sending the -CANCEL_PUSH frame, a QUIC STOP_SENDING frame with an appropriate error code can -also be used (e.g., HTTP_PUSH_REFUSED, HTTP_PUSH_ALREADY_IN_CACHE; see -{{errors}}). This asks the server not to transfer additional data and indicates -that it will be discarded upon receipt. +CANCEL_PUSH frame, a QUIC STOP_SENDING frame with an error code of +HTTP_REQUEST_CANCELLED can be used. This asks the server not to transfer +additional data and indicates that it will be discarded upon receipt. # Connection Closure @@ -1599,18 +1598,17 @@ HTTP_WRONG_SETTING_DIRECTION (0x01): : A client-only setting was sent by a server, or a server-only setting by a client. -HTTP_PUSH_REFUSED (0x02): -: The server has attempted to push content which the client will not accept - on this connection. +Reserved (0x02): +: This code is reserved and has no meaning. HTTP_INTERNAL_ERROR (0x03): : An internal error has occurred in the HTTP stack. -HTTP_PUSH_ALREADY_IN_CACHE (0x04): -: The server has attempted to push content which the client has cached. +Reserved (0x04): +: This code is reserved and has no meaning. HTTP_REQUEST_CANCELLED (0x05): -: The request or its response is cancelled. +: The request or its response (including pushed response) is cancelled. HTTP_INCOMPLETE_REQUEST (0x06): : The client's stream terminated without containing a fully-formed request. @@ -1903,9 +1901,9 @@ The entries in the following table are registered by this document. | ----------------------------------- | ---------- | ---------------------------------------- | ---------------------- | | HTTP_NO_ERROR | 0x0000 | No error | {{http-error-codes}} | | HTTP_WRONG_SETTING_DIRECTION | 0x0001 | Setting sent in wrong direction | {{http-error-codes}} | -| HTTP_PUSH_REFUSED | 0x0002 | Client refused pushed content | {{http-error-codes}} | +| Reserved | 0x0002 | N/A | N/A | | HTTP_INTERNAL_ERROR | 0x0003 | Internal error | {{http-error-codes}} | -| HTTP_PUSH_ALREADY_IN_CACHE | 0x0004 | Pushed content already cached | {{http-error-codes}} | +| Reserved | 0x0004 | N/A | N/A | | HTTP_REQUEST_CANCELLED | 0x0005 | Data no longer needed | {{http-error-codes}} | | HTTP_INCOMPLETE_REQUEST | 0x0006 | Stream terminated early | {{http-error-codes}} | | HTTP_CONNECT_ERROR | 0x0007 | TCP reset or error on CONNECT request | {{http-error-codes}} |