diff --git a/_sources/apiref.txt b/_sources/apiref.txt index 05279169..362c43ea 100644 --- a/_sources/apiref.txt +++ b/_sources/apiref.txt @@ -281,6 +281,10 @@ Enums (``9``) The WINDOW_UPDATE frame. + .. macro:: NGHTTP2_CONTINUATION + + (``10``) + The CONTINUATION frame. .. type:: nghttp2_flag @@ -529,18 +533,18 @@ Types (structs, unions and typedefs) The frame header. - .. member:: uint16_t length + .. member:: size_t length The length field of this frame, excluding frame header. + .. member:: int32_t stream_id + + The stream identifier (aka, stream ID) .. member:: uint8_t type The type of this frame. See `nghttp2_frame`. .. member:: uint8_t flags The flags. - .. member:: int32_t stream_id - - The stream identifier (aka, stream ID) .. type:: nghttp2_data_source @@ -962,27 +966,6 @@ Types (structs, unions and typedefs) `nghttp2_session_recv()` and `nghttp2_session_send()` functions immediately return :macro:`NGHTTP2_ERR_CALLBACK_FAILURE`. -.. type:: typedef int (*nghttp2_on_frame_recv_parse_error_callback) (nghttp2_session *session, nghttp2_frame_type type, const uint8_t *head, size_t headlen, const uint8_t *payload, size_t payloadlen, int lib_error_code, void *user_data) - - - Callback function invoked when the received control frame octets - could not be parsed correctly. The *type* indicates the type of - received non-DATA frame. The *head* is the pointer to the header of - the received frame. The *headlen* is the length of the - *head*. According to the spec, the *headlen* is always 8. In other - words, the *head* is the first 8 bytes of the received frame. The - *payload* is the pointer to the data portion of the received frame. - The *payloadlen* is the length of the *payload*. This is the data - after the length field. The *lib_error_code* is one of the error - code defined in :macro:`nghttp2_error` and indicates the error. The - *user_data* pointer is the third argument passed in to the call to - `nghttp2_session_client_new()` or `nghttp2_session_server_new()`. - - The implementation of this function must return 0 if it - succeeds. If nonzero is returned, it is treated as fatal error and - `nghttp2_session_recv()` and `nghttp2_session_send()` functions - immediately return :macro:`NGHTTP2_ERR_CALLBACK_FAILURE`. - .. type:: typedef int (*nghttp2_on_unknown_frame_recv_callback) (nghttp2_session *session, const uint8_t *head, size_t headlen, const uint8_t *payload, size_t payloadlen, void *user_data) @@ -1099,10 +1082,6 @@ Types (structs, unions and typedefs) Callback function invoked when request from the remote peer is received. - .. member:: nghttp2_on_frame_recv_parse_error_callback - - Callback function invoked when the received non-DATA frame octets - could not be parsed correctly. .. member:: nghttp2_on_unknown_frame_recv_callback on_unknown_frame_recv_callback Callback function invoked when the received frame type is @@ -1326,10 +1305,7 @@ Functions invalid, :member:`nghttp2_session_callbacks.on_invalid_frame_recv_callback` is invoked. - 4. If the received frame could not be unpacked correctly, - :member:`nghttp2_session_callbacks.on_frame_recv_parse_error_callback` - is invoked. - 5. If the received frame type is unknown, + 4. If the received frame type is unknown, :member:`nghttp2_session_callbacks.on_unknown_frame_recv_callback` is invoked. diff --git a/apiref.html b/apiref.html index 823acb97..59c055f8 100644 --- a/apiref.html +++ b/apiref.html @@ -547,6 +547,13 @@ The GOAWAY frame.

The WINDOW_UPDATE frame.

+
+
+NGHTTP2_CONTINUATION
+

(10) +The CONTINUATION frame.

+
+
@@ -908,10 +915,16 @@ uint16_t valuelen
-uint16_t length
+size_t length

The length field of this frame, excluding frame header.

+
+
+int32_t stream_id
+

The stream identifier (aka, stream ID)

+
+
uint8_t type
@@ -924,12 +937,6 @@ uint8_t flags -
-int32_t stream_id
-

The stream identifier (aka, stream ID)

-
-
@@ -1466,27 +1473,6 @@ succeeds. If nonzero is returned, it is treated as fatal error and immediately return NGHTTP2_ERR_CALLBACK_FAILURE.

-
-
-typedef int (*nghttp2_on_frame_recv_parse_error_callback)(nghttp2_session *session, nghttp2_frame_type type, const uint8_t *head, size_t headlen, const uint8_t *payload, size_t payloadlen, int lib_error_code, void *user_data)
-

Callback function invoked when the received control frame octets -could not be parsed correctly. The type indicates the type of -received non-DATA frame. The head is the pointer to the header of -the received frame. The headlen is the length of the -head. According to the spec, the headlen is always 8. In other -words, the head is the first 8 bytes of the received frame. The -payload is the pointer to the data portion of the received frame. -The payloadlen is the length of the payload. This is the data -after the length field. The lib_error_code is one of the error -code defined in nghttp2_error and indicates the error. The -user_data pointer is the third argument passed in to the call to -nghttp2_session_client_new() or nghttp2_session_server_new().

-

The implementation of this function must return 0 if it -succeeds. If nonzero is returned, it is treated as fatal error and -nghttp2_session_recv() and nghttp2_session_send() functions -immediately return NGHTTP2_ERR_CALLBACK_FAILURE.

-
-
typedef int (*nghttp2_on_unknown_frame_recv_callback)(nghttp2_session *session, const uint8_t *head, size_t headlen, const uint8_t *payload, size_t payloadlen, void *user_data)
@@ -1635,13 +1621,6 @@ because of an error.

received.

-
-
-nghttp2_on_frame_recv_parse_error_callback
-

Callback function invoked when the received non-DATA frame octets -could not be parsed correctly.

-
-
nghttp2_on_unknown_frame_recv_callback on_unknown_frame_recv_callback
@@ -1881,9 +1860,6 @@ is invoked. invalid, nghttp2_session_callbacks.on_invalid_frame_recv_callback is invoked. -
  • If the received frame could not be unpacked correctly, -nghttp2_session_callbacks.on_frame_recv_parse_error_callback -is invoked.
  • If the received frame type is unknown, nghttp2_session_callbacks.on_unknown_frame_recv_callback is invoked.
    • diff --git a/genindex.html b/genindex.html index 1f8b6e2c..3878afc4 100644 --- a/genindex.html +++ b/genindex.html @@ -167,6 +167,10 @@ +
    NGHTTP2_CONTINUATION (C macro) +
    + +
    NGHTTP2_DATA (C macro)
    @@ -610,6 +614,8 @@
    nghttp2_on_data_send_callback (C type)
    +
    +
    nghttp2_on_end_headers_callback (C type)
    @@ -618,17 +624,11 @@
    nghttp2_on_frame_not_send_callback (C type)
    -
    -
    nghttp2_on_frame_recv_callback (C type)
    -
    nghttp2_on_frame_recv_parse_error_callback (C type) -
    - -
    nghttp2_on_frame_send_callback (C type)
    @@ -805,10 +805,6 @@ -
    nghttp2_session_callbacks.nghttp2_on_frame_recv_parse_error_callback (C member) -
    - -
    nghttp2_session_callbacks.on_data_chunk_recv_callback (C member)
    diff --git a/nghttp2.h.html b/nghttp2.h.html index 13e25f44..9728d729 100644 --- a/nghttp2.h.html +++ b/nghttp2.h.html @@ -502,7 +502,11 @@ /** * The WINDOW_UPDATE frame. */ - NGHTTP2_WINDOW_UPDATE = 9 + NGHTTP2_WINDOW_UPDATE = 9, + /** + * The CONTINUATION frame. + */ + NGHTTP2_CONTINUATION = 10 } nghttp2_frame_type; /** @@ -638,7 +642,11 @@ /** * The length field of this frame, excluding frame header. */ - uint16_t length; + size_t length; + /** + * The stream identifier (aka, stream ID) + */ + int32_t stream_id; /** * The type of this frame. See `nghttp2_frame`. */ @@ -647,10 +655,6 @@ * The flags. */ uint8_t flags; - /** - * The stream identifier (aka, stream ID) - */ - int32_t stream_id; } nghttp2_frame_hd; @@ -1206,33 +1210,6 @@ typedef int (*nghttp2_on_request_recv_callback) (nghttp2_session *session, int32_t stream_id, void *user_data); -/** - * @functypedef - * - * Callback function invoked when the received control frame octets - * could not be parsed correctly. The |type| indicates the type of - * received non-DATA frame. The |head| is the pointer to the header of - * the received frame. The |headlen| is the length of the - * |head|. According to the spec, the |headlen| is always 8. In other - * words, the |head| is the first 8 bytes of the received frame. The - * |payload| is the pointer to the data portion of the received frame. - * The |payloadlen| is the length of the |payload|. This is the data - * after the length field. The |lib_error_code| is one of the error - * code defined in :enum:`nghttp2_error` and indicates the error. The - * |user_data| pointer is the third argument passed in to the call to - * `nghttp2_session_client_new()` or `nghttp2_session_server_new()`. - * - * The implementation of this function must return 0 if it - * succeeds. If nonzero is returned, it is treated as fatal error and - * `nghttp2_session_recv()` and `nghttp2_session_send()` functions - * immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`. - */ -typedef int (*nghttp2_on_frame_recv_parse_error_callback) -(nghttp2_session *session, nghttp2_frame_type type, - const uint8_t *head, size_t headlen, - const uint8_t *payload, size_t payloadlen, - int lib_error_code, void *user_data); - /** * @functypedef * @@ -1382,12 +1359,6 @@ */ nghttp2_on_request_recv_callback on_request_recv_callback; /** - * Callback function invoked when the received non-DATA frame octets - * could not be parsed correctly. - */ - nghttp2_on_frame_recv_parse_error_callback - on_frame_recv_parse_error_callback; - /** * Callback function invoked when the received frame type is * unknown. */ @@ -1670,10 +1641,7 @@ * invalid, * :member:`nghttp2_session_callbacks.on_invalid_frame_recv_callback` * is invoked. - * 4. If the received frame could not be unpacked correctly, - * :member:`nghttp2_session_callbacks.on_frame_recv_parse_error_callback` - * is invoked. - * 5. If the received frame type is unknown, + * 4. If the received frame type is unknown, * :member:`nghttp2_session_callbacks.on_unknown_frame_recv_callback` * is invoked. * diff --git a/objects.inv b/objects.inv index 3f58c097..b02a23f2 100644 Binary files a/objects.inv and b/objects.inv differ diff --git a/package_README.html b/package_README.html index 9d3f64aa..0096a7c0 100644 --- a/package_README.html +++ b/package_README.html @@ -175,7 +175,7 @@ header compression Done Header Continuation -  +Done ALPN Done @@ -189,8 +189,8 @@ header compression implementation. These endpoints supports HTTP-draft-09/2.0 and the earlier draft versions are not supporeted.