dbb131d13d
Simplify framebufmark calculation for DATA frame
2014-02-11 18:55:22 +09:00
6364ae1a98
Fix nghttp2_active_outbound_item is not reset on DATA deferred
2014-02-11 18:43:45 +09:00
16b5e99e88
Bitwise-OR last CONTINUATION flags to first HEADERS flags
2014-02-11 17:30:38 +09:00
788072af9b
Fix HEADERS padding is not added
2014-02-11 17:23:08 +09:00
3144bcbe20
Remove unused iframe->error_code
2014-02-11 16:34:42 +09:00
eb2856f3df
Add inbound_frame_reset_left() not to forget to reset iframe->buflen
2014-02-11 16:33:07 +09:00
9865b46905
Don't change state in inbound_frame_handle_pad
2014-02-11 16:24:21 +09:00
78d202ac30
Callback based padding from application
...
Now previous padding options are removed and instead we added
select_padding_callback to select padding length for each frame
by application. If this callback is not implemented by application,
no padding is added.
This change also fixes the broken session_detect_idle_stream()
if stream_id is our side.
2014-02-11 15:28:44 +09:00
118ed09da5
Allow disabling padding
2014-02-09 23:53:53 +09:00
5b58b4ace5
Add padding if payload length is zero
2014-02-09 22:01:07 +09:00
68b5ffc1dc
Rename padding related names
2014-02-09 21:46:15 +09:00
ba95cd936d
Fix flow control error because padding is excluded
2014-02-09 18:26:46 +09:00
1db2195389
Implement padding for HEADERS and CONTINUATION
2014-02-09 15:17:26 +09:00
10feab02e8
Fix bufoff_ptr if no padding is made
2014-02-09 12:39:43 +09:00
e9d1ba2539
Handle incoming PAD_HIGH and PAD_LOW in inbound_frame_handle_padding
2014-02-09 12:39:43 +09:00
2ff3d97b2e
Add nghttp2_frame_add_pad to deal with adding pads
2014-02-09 12:39:43 +09:00
b6a0eff8a8
Add more DEBUGFs
2014-02-08 00:32:50 +09:00
814d0f76f3
Implement DATA frame padding
2014-02-08 00:23:18 +09:00
f26270b5b4
Change SETTINGS payload format according to the spec
2014-02-06 22:06:42 +09:00
40a5756564
Terminate connection if unknown frame type is received
2014-02-06 21:42:49 +09:00
f2c654f898
Fix reception of ENABLE_PUSH ignored; strict check for SETTINGS value
2014-02-06 21:39:58 +09:00
c79adf6997
Remove flow control disabling feature
2014-02-06 00:23:20 +09:00
08ff95d402
Detect frame reception for idle stream and make it connection error
...
Only stream ID which larger than currently used stream ID is
detected as idle.
2014-02-01 17:03:55 +09:00
2402b46cf3
Fix bug header block is not ignored as properly
2014-01-30 21:26:18 +09:00
ab684a9f30
Remove nghttp2_on_request_recv_callback
...
It is easy enough to check the end of incoming data by evaluating
frame->hd.flags & NGHTTP2_FLAG_END_STREAM in on_frame_recv_callback
2014-01-29 21:56:01 +09:00
bbdc015e84
Call on_frame_recv_callback for DATA even if stream has been closed
...
This makes the callback semantics consistent with the other
frames like HEADERS/PUSH_PROMISE.
2014-01-29 21:34:48 +09:00
e186e01933
Replace on_end_headers_callback with on_begin_headers_callback
...
Previously, there is inconsistency when on_frame_recv_callback
is called between HEADERS/PUSH_PROMISE and the other frames.
For former case, it is called before header block, in latter
case, it is called after whole frame is received. To make it
consistent, we call on_frame_recv_callback for HEADERS/PUSH_PROMISE
after its frame is fully received. Since on_frame_recv_callback
can signal the end of header block, we replaced on_end_headers_callback
with on_begin_headers_callback, which is called when the reception
of the header block is started.
2014-01-29 21:23:13 +09:00
4a56c0ae3d
Update doc
2014-01-28 01:59:21 +09:00
f308b7b512
Allow NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE return from on_headers_callback
2014-01-28 01:17:23 +09:00
7f5a87395e
Refactor a bit
2014-01-27 23:28:45 +09:00
a3193bee69
Code cleanup
2014-01-27 23:00:08 +09:00
a3082b7c1e
Remove nghttp2_on_data_recv_callback and nghttp2_on_data_send_callback
...
nghttp2_data is added to nghttp2_frame union. When DATA is
received, nghttp2_on_frame_recv_callback is called. When DATA is
sent, nghttp2_on_frame_send_callback is called.
2014-01-27 22:16:05 +09:00
fc07a62337
Rename nghttp2_data as nghttp2_private_data
...
This is a preparation to add public nghttp2_data struct to
nghttp2_frame union.
2014-01-27 21:22:33 +09:00
9314e30987
Support transmission of CONTINUATION, change nghttp2_frame_hd
...
The maximum frame size including header block is still limited
to NGHTTP2_HD_MAX_BUFFER_LENGTH, which is 32KB.
2014-01-26 23:10:33 +09:00
91401cfe26
Support CONTINUATION frame reception
2014-01-26 20:31:28 +09:00
e7fc2951b8
nghttp2_hd: Define dedicated struct for HPACK deflater and inflater
2014-01-26 17:53:04 +09:00
45a9f0b637
Remove nghttp2_frame_unpack_* functions
2014-01-26 16:46:18 +09:00
dba2406aba
nghttp2_sesson_mem_recv: Process incoming data in streaming fashion
...
Now incoming data is processed in very small buffer (up to 8 bytes)
using state machine. GOAWAY debug data can get to 16K - 1, and we
don't have callback for it. Since we don't want to buffer that
amount of data just for debugging, we currently discard it.
This change also makes parse_error callback not function.
It probably be removed from API.
2014-01-26 15:44:43 +09:00
8317559090
nghttp2_hd: Implement stream header inflater
...
This stream inflater can inflate incoming header block in streaming
fashion. Currently, we buffer up single name/value pair, but we chose
far more smaller buffer size than HTTP/2 frame size.
2014-01-25 18:24:15 +09:00
6540ac1bab
Fix crash
2014-01-23 21:25:49 +09:00
62e394b3e3
Fix memory leak
2014-01-23 00:28:23 +09:00
d647799c6f
Take int account received data length to check flow control error
2014-01-20 19:50:11 +09:00
594e1caad6
Code cleanup
2014-01-20 00:01:10 +09:00
d0968ea609
Tear down session if GOAWAY with stream ID != 0
2014-01-19 00:37:45 +09:00
2a95da6bee
Code cleanup
2014-01-18 16:25:44 +09:00
b6d039e888
Make nghttp2_is_fatal public API
2014-01-18 16:24:44 +09:00
e960c56aad
Don't call on_request_recv_callback if header decompression failed
2014-01-17 23:49:40 +09:00
22a4e3eab8
Remove nghttp2_session_continue
...
nghttp2_session_continue is removed. Now just call
nghttp2_session_mem_recv to continue after NGHTTP2_ERR_PAUSE.
2014-01-17 22:52:30 +09:00
b2bf18d40f
Code cleanup
2014-01-17 10:15:14 +09:00
5d535766bf
inflate_header_block: Terminate session on compression error
...
Code cleanup is done as well
2014-01-17 10:13:33 +09:00
0e4b3d435e
Emit header name/value pair using callback functions
...
Now, in nghttp2_on_frame_recv_callback, nva and nvlen in
HEADERS and PUSH_PROMISE frames are always NULL and 0 respectively.
The header name/value pairs are emitted successive
nghttp2_on_header_callback functions. The end of header fields are
signaled with nghttp2_on_end_headers_callback function.
Since NGHTTP2_ERR_PAUSE for nghttp2_on_frame_recv_callback is
introduced to handle header block, it is now deprecated.
Instead, nghttp2_on_header_callback can be paused using
NGHTTP2_ERR_PAUSE.
2014-01-17 01:49:43 +09:00
a85a11c1d9
Update priority for the stream to get response only
2014-01-09 23:30:45 +09:00
5aa487c5ba
nghttp2_stream: flags is now nghttp2_stream_flags
...
We use this flag to know whether it is pushed or not
2014-01-09 23:01:02 +09:00
45837a2cfa
Ensure PRIORITY frame reception/transmission rule
2014-01-09 22:06:38 +09:00
fe1a39ed10
Allow client side to send PUSH_PROMISE
2014-01-09 21:39:29 +09:00
9cb8754d09
Rename nghttp2_session_fail_session as nghttp2_session_terminate_session
2013-12-26 00:23:07 +09:00
dfcdea894b
Move header name/value pair validation to on_*_received functions
2013-12-25 23:38:55 +09:00
794633f894
Add nghttp2_session_set_stream_user_data API function
2013-12-23 17:40:34 +09:00
650f63c728
Fail session on the reception of DATA in closed stream or illegal state
2013-12-15 16:23:01 +09:00
41104f7b63
Abandon DATA frame priority adjustment (again)
...
We tried several times about this subject, but for the current
HTTP/2.0 priority scheme, we think it is best to serve the highest
priroty streams first (interleaving streams if there are several
higest ones). There are an issue when aggregating several frontend
connections to one connection in backend, but it is HTTP/2.0
spec issue, rather than implementation.
2013-12-14 17:02:59 +09:00
364501a2cd
Get rid of magic value NGHTTP2_PRI_DECAY
...
For now we just double the priority value on each DATA frame
transmission. If priority is 0, it becomes to 1 and goes all
the way to (1 << 30) - 1.
2013-12-13 22:26:09 +09:00
e17f888944
Lower priority by constant value
2013-12-11 23:20:59 +09:00
d773b42a2d
Ensure that pri goes to the lowest value
2013-12-07 16:14:39 +09:00
1dea4e154b
Reintroduce priority adjustment for DATA frame
...
This mechanism existed but was deleted. We bring it back in order to
prevent lower priority streams from starving.
2013-12-05 23:12:18 +09:00
a3c888d7d1
nghttp2_map: Implement hash table
2013-12-05 00:53:03 +09:00
d0d0009a50
Use largest valid stream ID which passed to callback as last-stream-ID
...
Previously we use largest stream ID received so far as last-stream-ID,
and it is irrevant that it is passed to the callback (thus upper layer).
Now the stream ID which is passed to callback is eligible to
last-stream-ID.
2013-11-28 23:26:34 +09:00
bc21edf5b6
Interleave streams with the same priority
2013-11-19 23:59:10 +09:00
45c3c5b80f
Cleanup nghttp2_session_mem_recv
2013-11-12 10:52:03 +09:00
a39a816a63
Cleanup nghttp2_session_next_data_read
2013-11-12 10:48:29 +09:00
5044b59453
Handle error from nghttp2_session_push_back_deferred_data
2013-11-12 10:44:04 +09:00
2ae788eddd
Replace nghttp2_set_option with nghttp2_session_{client,server}_new2
...
nghttp2_session_client_new2 and nghttp2_session_server_new2 take
additional parameters which specifies session options.
nghttp2_set_option is somewhat crumsy because of type checking.
Now we use nghttp2_opt_set, which specifies individual options with
types. We changed the value of nghttp2_opt, so this change will
require re-compile.
2013-11-08 00:12:39 +09:00
4bc44b0c0b
Implement SETTINGS_ENABLE_PUSH
...
It is not clear that SETTINGS_ENABLE_PUSH = 0 disallows HEADERS
to the reserved streams. For now, we just check the reception
and transmission of PUSH_PROMISE against SETTINGS_ENABLE_PUSH.
2013-11-02 16:53:06 +09:00
29ef3fde8b
Initialize settings in common function
2013-11-02 16:23:56 +09:00
2e7bc014e1
Return 0 if recv_window_size is negative; add tests
2013-10-30 01:58:38 +09:00
dfa1194804
Add new API to return effective recv data/win size for connection
...
Using this feature, connection level flow control is now enabled
in nghttpx.
2013-10-30 00:51:01 +09:00
6c23c34d77
Add new API to return effective received data length and local window size
2013-10-30 00:07:35 +09:00
a4cf37306a
Enfoce flow control error strictly
...
Now we have SETTINGS synchronization, flow control error can be
detected strictly. If DATA frame is received with length > 0 and
current received window size is equal to or larger than local
window size (latter happens when we shirnk window size), it is
subject to FLOW_CONTROL_ERROR,
2013-10-29 22:46:30 +09:00
67ce60544e
Change maximum frame length to 16383
2013-10-27 21:17:09 +09:00
cfb9857f27
Use FRAME_SIZE_ERROR for invalid payload length
2013-10-27 20:55:44 +09:00
431f78f008
Rename NGHTTP2_ERR_FRAME_TOO_LARGE as NGHTTP2_ERR_FRAME_SIZE_ERROR
2013-10-27 19:35:36 +09:00
5ace898392
Update error code
2013-10-27 19:31:24 +09:00
a46ccdb144
Apply initiated SETTINGS changes on reception of ACK
2013-10-27 19:22:51 +09:00
8f8c841df0
Merge branch 'master' into hpack-exp
2013-10-25 22:51:51 +09:00
896db5b24f
API change: Add flags parameter to all submit_* functions
...
The nghttp2_submit_{request,response} family do not get this change.
2013-10-25 22:50:24 +09:00
9e50ae46d9
nghttp_hd: Use NGHTTP2_HD_SIDE_{REQUEST,RESPONSE} instead of {CLIENT,SERVER}
...
This change conveys better notion about compression context.
2013-10-21 00:44:39 +09:00
0efa6e657f
Fix outbound flow control count
...
We wrongly added the whole payload length even if we sent part of it.
2013-10-18 19:43:59 +09:00
e85418f045
Fix local window size adjustments
...
Now shrinking local window size properly limits the amount of
WINDOW_UPDATE value so that shrinked window is honored.
2013-10-12 17:02:37 +09:00
2b9d4efa68
Refactor predicate_*_send functions
2013-10-04 22:42:34 +09:00
252c77f775
Return NGHTTP2_ERR_INVALID_STREAM_STATE for DATA, WINDOW_UPDATE to reserved
...
Use NGHTTP2_ERR_INVALID_STREAM_STATE when trying to send DATA or
WINDOW_UPDATE to reserved stream.
Also a bit refactored nghttp2_session_predicate_window_update_send
and nghttp2_session_predicate_data_send
2013-10-04 21:59:44 +09:00
bddb4de946
Fix data_stream_id and data_flags are not assigned
2013-10-03 22:51:58 +09:00
21d76dcc75
Add nghttp2_session_continue API function
...
The NGHTTP2_ERR_PAUSE library error code is introduced to pause
the execution of nghttp2_session_mem_recv() when that error code
is returned from nghttp2_on_frame_recv_callback or
nghttp2_on_data_chunk_recv_callback. If this happens, the parameters
available for both callbacks are retained until the application
calls nghttp2_session_continue(). The application must retain
input bytes which was used to produce the frame.
After successful call of nghttp2_session_continue, the application
can continue to call nghttp2_session_mem_recv() to process
additional data.
2013-09-28 17:59:24 +09:00
99ba622fed
Add NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS option
...
And utilize it in nghttp to limit initial max concurrent streams.
2013-09-14 19:41:49 +09:00
87abc8b951
nghttp2_session_on_window_update_received: Split into 2 functions
2013-09-05 23:21:00 +09:00
464f141593
Refactor deeply nested if blocks
2013-09-05 23:17:16 +09:00
a7bd4f33a3
Call on_stream_close_callback for stream in NGHTTP2_STREAM_INITIAL state
...
We call on_stream_close_callback even if stream->state is
NGHTTP2_STREAM_INITIAL. This will happen while sending request
HEADERS, a local endpoint receives RST_STREAM for that
stream. It may be PROTOCOL_ERROR, but without notifying stream
closure will hang the stream in a local endpoint.
2013-09-02 23:09:36 +09:00
59286adc5e
Add int return value to nghttp2_on_unknown_frame_recv_callback
2013-08-29 23:10:18 +09:00
db4f519500
Add int return value to nghttp2_on_frame_recv_parse_error_callback
2013-08-29 23:07:07 +09:00
053c444769
Add int return value to nghttp2_on_request_recv_callback
2013-08-29 23:03:21 +09:00
81653c1d1b
Add int return value to nghttp2_on_stream_close_callback
2013-08-29 22:58:05 +09:00
5a7f65f1f7
Add int return value to on_data_send_callback
2013-08-29 21:55:04 +09:00
b9d2f9b6b0
Add int return value to on_frame_not_send_callback
2013-08-29 21:51:58 +09:00
d4852b0f11
Add int return value to on_frame_send_callback
2013-08-29 21:48:34 +09:00
a51cdaacfc
Add int return value to nghttp2_before_frame_send_callback
2013-08-29 21:45:10 +09:00
544ac9f61f
Add int return value to nghttp2_on_data_recv_callback
2013-08-29 21:41:33 +09:00
972b47d6af
Add int return value to nghttp2_on_data_chunk_recv_callback
2013-08-29 21:39:32 +09:00
fb7d22fcb9
Add int return value to nghttp2_on_invalid_frame_recv_callback
2013-08-29 21:37:26 +09:00
a59cd3be82
Add int return value to nghttp2_on_frame_recv_callback
2013-08-29 21:33:52 +09:00
5c6ef84b97
Use COMPRESSION_ERROR if the cause of error comes from compressor
2013-08-28 23:32:37 +09:00
b37f99ca03
Connection error if payload size is strictly greater than (1 << 14) - 1
...
It would be desired to add option to make this limit configurable.
Fix scripted_recv_callback in tests.
2013-08-28 02:13:57 +09:00
2d41c99289
Connection error if header continuation is employed by peer for now
2013-08-24 19:28:57 +09:00
30d3ea7c93
Use old C style comment
2013-08-23 03:33:05 +09:00
35229b250f
Treat reception of DATA in reserved stream as connection error
2013-08-23 03:33:05 +09:00
618a1e0782
Update doc
2013-08-23 03:33:05 +09:00
e278efdf38
Strict handling of connection error
...
Following cases are now treated as connection error of type
PROTOCOL_ERROR.
* Receiving HEADERS from client in reserved (local)
* Receiving PUSH_PROMISE against peer-initiated stream
* Receiving WINDOW_UPDATE against in reserved (local, remote)
2013-08-23 03:33:05 +09:00
0c9703fa2c
Remove NGHTTP2_FLAG_END_FLOW_CONTROL
2013-08-23 03:33:05 +09:00
b1ae1c30d8
Allow duplicate settings ID in SETTINGS
...
If multiple same ID are found, use the last one.
2013-08-23 03:33:05 +09:00
407027452c
Update doc
2013-08-17 22:34:57 +09:00
3ee7ca2cdd
Handle non-fatal error from nghttp2_submit_data
2013-08-10 15:26:12 +09:00
a52ca391a2
Do not RST_STREAM for DATA against nonexistent stream
...
This may be useful to the misbehaving implementation, but it could
result in lots of RST_STREAM, so just ignore it for now.
2013-08-10 15:13:53 +09:00
80bacd0a54
Disable local flow control in nghttp2_submit_window_update()
2013-08-09 23:46:12 +09:00
1155606d5e
Rewrite re-prioritization with PRIORITY
2013-08-09 23:40:41 +09:00
0dec04921d
Remove priority adjustment for a DATA frame
...
Simply it does not work as expected.
2013-08-09 21:21:14 +09:00
a3ff4cb50b
Rename window_size member of nghttp2_session as remote_window_size
2013-08-09 01:31:15 +09:00
19377fb3cd
Allow disabling auto WINDOW_UPDATE for connection and stream individually
...
Now NGHTTP2_OPT_NO_AUTO_WINDOW_UPDATE is split into 2 options:
NGHTTP2_OPT_NO_AUTO_STREAM_WINDOW_UPDATE and
NGHTTP2_OPT_NO_AUTO_CONNECTION_WINDOW_UPDATE.
This is preparation for the upcoming removal of END_FLOW_CONTROL
flag. For nghttpx, instead of using END_FLOW_CONTROL to disable
connection-level flow control, increase window size by large
enough value, which is friendly way to current chromium
implementation.
2013-08-09 01:23:39 +09:00
b979d2e8d2
Support increment/reduction of local window size by WINDOW_UPDATE
2013-08-09 00:58:52 +09:00
e67096fef3
Handle overflow in initial window update in stream
...
Rename window_size in nghttp2_stream as remote_window_size.
2013-08-08 21:12:49 +09:00
dcfa421d6f
Fix connection-level flow control (local)
...
Fix the bug that connection-level local window is not updated
for the data is the last part of the stream. For the stream
level window may ignore this, connection-level window must
be updated. Also this change fixes the bug that connection-level
window is not updated for the ignored DATA frames.
2013-08-07 22:02:30 +09:00
737ac01d91
Add API for HTTP Upgrade
2013-08-03 18:05:14 +09:00
bd64619cf5
Fix segmentation fault
...
Fix segmentation fault if DATA frame is received for the stream
which is already closed.
2013-07-31 20:32:44 +09:00
8033152e80
Disable local flow control on FLOW_CONTROL_OPTIONS = 1
2013-07-28 19:05:51 +09:00
20173b5f61
NGHTTP2_SETTINGS_FLOW_CONTROL_OPTIONS: Check least significant bit only
2013-07-26 23:11:41 +09:00
9c54e63871
Remove bogus assert
2013-07-26 01:34:57 +09:00
48d7453a21
Rename SPDY terms
2013-07-25 21:18:13 +09:00
1056d8690e
Rename functions related to HEADERS
2013-07-25 21:07:38 +09:00
3cc71a707e
Rename nghttp2_headers_category members
...
Add NGHTTP2_HCAT_PUSH_RESPONSE
2013-07-25 20:57:50 +09:00
84cbebf4f7
Implement server push
2013-07-25 01:59:48 +09:00
b7ff05c4c6
Fail session if header compression failed on send
2013-07-23 22:47:15 +09:00
65cb559431
Change priority update scheme
2013-07-23 21:33:28 +09:00
4b6885ce9f
Send PRIORITY with current stream priority
2013-07-23 00:36:20 +09:00
6f28d44bef
Call nghttp2_session_handle_invalid_connection if stream_id == 0 or != 0 case
2013-07-23 00:33:47 +09:00
0bcf90d32d
Support PRIORITY frame send and receive
2013-07-23 00:28:00 +09:00
1dd21c1e30
Handle invalid stream ID (== 0 or != 0) cases
2013-07-21 18:40:47 +09:00
ed39044273
nghttp2_session_handle_invalid_stream: Remove stream_id parameter
2013-07-21 18:26:29 +09:00
ce47881e73
nghttp2_session_handle_parse_error: Call nghttp2_session_fail_session
2013-07-21 18:23:50 +09:00
d96da77412
Add nghttp2_session_handle_invalid_connction to simply code
2013-07-21 18:20:23 +09:00
8b3a3efadc
Change priority increasing scheme
2013-07-20 01:58:44 +09:00
aa4df35a10
Remove NGHTTP2_OPT_MAX_RECV_CTRL_FRAME_BUFFER option
2013-07-20 00:24:25 +09:00
b5810479a4
Remove NGHTTP2_ERR_CREDENTIAL_PENDING check
2013-07-20 00:22:12 +09:00
3186dede72
Add comment
2013-07-20 00:21:07 +09:00
30d2c86a7a
Remove old zlib compression and other cleanup
2013-07-20 00:20:16 +09:00
61bf7c6b02
Integrate new header compression
2013-07-20 00:08:14 +09:00
76b430c26b
Invoke on_invalid_frame_recv_callback on session failure
2013-07-16 23:47:56 +09:00
a3bdda68f8
End flow control by WINDOW_UPDATE
2013-07-16 21:30:36 +09:00
d54cfb88ff
Add connection-level flow control
2013-07-16 20:54:24 +09:00
1fdaa7e59a
Disable flow control entirely with FLOW_CONTROL_OPTIONS
2013-07-16 18:26:57 +09:00
24cab312cf
Make spdycat and spdyd barely work
2013-07-16 00:15:04 +09:00
48cb017245
Implement HTTP-draft-04/2.0
2013-07-15 21:45:59 +09:00
0edce70343
Rebranding nghttp2
2013-07-13 00:43:06 +09:00
Tatsuhiro Tsujikawa