b78a51da0e
Support graceful shutdown using multiple GOAWAY
...
Add last_stream_id parameter to nghttp2_submit_goaway(). To terminate
connection immediately with application chosen last stream ID,
nghttp2_session_terminate_session2() was added.
2014-06-18 11:35:08 +09:00
975524a125
Don't send GOAWAY with last stream ID larger than the value previously sent
2014-06-18 11:03:55 +09:00
817e1ce2a7
Rename last_stream_id in nghttp2_session to remote_last_stream_id
...
This commits also fixes last stream ID in GOAWAY uses wrong stream ID.
2014-06-18 10:56:32 +09:00
62900cd85b
Allow multiple transmission of GOAWAY frame
2014-06-18 10:51:33 +09:00
174e410b93
Use hex in nghttp2_error_code and nghttp2_settings_id
2014-06-18 10:48:31 +09:00
a5af621947
Change protocol ID to h2-13
2014-06-18 09:42:51 +09:00
9a3cdeb7e6
Fix some other shorten-64-to-32 casting error found by MSVC (64bits)
...
Thanks for Pascal
2014-06-16 19:17:49 +02:00
c9b6371977
When assertions is disable, there is a warning about unused check_index_range function
...
Make the check for a valid index range a macro, so the compiler doesn't
whine if it's not used, but it's available if it *is* used.
2014-06-16 18:52:11 +02:00
7f6ddd0f2e
Update huffman code table
2014-06-16 23:03:55 +09:00
f85a213fb1
Update static header table
2014-06-14 22:24:47 +09:00
dd006f8a79
Change protocol ID to h2-lc
2014-06-12 22:51:30 +09:00
a15d4fc306
Fix nghttp2_hd_huffman.h:41:31: warning: comma at end of enumerator list [-Wpedantic]
2014-06-11 23:43:10 +09:00
9b174bf5c9
Fix compile error with -Wshorten-64-to-32
...
The original patch was contributed by Alexis La Goutte
2014-06-11 23:37:16 +09:00
f0f5342cd4
Update doc
2014-06-11 01:40:20 +09:00
cfcecca751
Make return type of inbound_frame_set_settings_entry void
2014-06-10 21:32:20 +09:00
2878e1e258
Refactor storage of settings
...
Now local and remote settings values are stored in dedicated structure
nghttp2_settings_storage.
2014-06-10 21:29:19 +09:00
4596f73ee0
Fix unused header_cb_arg structure
2014-06-09 23:21:55 +09:00
caf3e1c035
Fix compile error with --enable-debug
2014-06-09 23:21:30 +09:00
dacc9b2f1c
Separate extension frames from core frames
...
ALTSVC and BLOCKED frames are now extension frames. To add new
extension frame without modifying nghttp2_frame union, which causes so
name bump, we separated extension frames from core frames.
nghttp2_frame includes generic nghttp2_extension. The payload member
of nghttp2_extension will point to the structure of extension frame
payload. The frame types of extension frames are defined in
nghttp2_ext_frame_type.
2014-06-09 23:16:54 +09:00
317b8baa4f
Set HTTP/2 protocol id to h2-13 for now
2014-06-07 19:39:14 +09:00
d4602a0991
Remove reserved field from ALTSVC frame
2014-06-07 19:10:09 +09:00
3daeadcb07
Remove bogus comments
2014-06-07 18:51:20 +09:00
19729962a3
Check stream_id is nonzero for DATA, HEADERS, PRIORITY, RST_STREAM, PUSH_PROMISE
2014-06-07 18:48:37 +09:00
bfaab30733
Allow transmission and reception of PRIORITY frame to a closed stream
2014-06-07 18:36:58 +09:00
c46d3dafc6
Remove PAD_HIGH and Pad High field
...
CONTINUATION now doesn't have padding.
2014-06-07 18:15:36 +09:00
70c86979e8
Ignore unknown settings ID
2014-06-07 16:41:36 +09:00
d402ba6fa2
Make settings_id 2 bytes field
2014-06-07 16:37:29 +09:00
458ccb3681
Ignore unknown frame types
...
Unexpected CONTINUATION frame is handled separately as connection
error.
2014-06-07 16:30:55 +09:00
3db8935e20
Remove per-frame compression
2014-06-07 16:04:43 +09:00
eb0a894ede
Merge branch 'Wshadow' of https://github.com/alagoutte/nghttp2 into alagoutte-Wshadow
2014-06-04 23:34:04 +09:00
6b08534ffc
Fix declaration of ‘index’ shadows a global declaration [-Werror=shadow]
...
I have this error with some old gcc (4.6) release (Ubuntu 12.04 or Travis...)
2014-06-03 10:20:05 +02:00
99aaaccf03
Update doc
2014-06-02 22:33:23 +09:00
4f7223e89f
Add note to manual how to submit frames to new stream ID
2014-05-31 22:01:18 +09:00
88b69bb669
Reduce huffman decoding table
...
Previously we have uint16_t as state member variable in
nghttp2_huff_decode structure to express -1 as failure. This is
because we have 256 valid states. However, we can express failed
state using flags member variable and make state uint8_t. This commit
does this and as a result the size of decoding table is reduced.
2014-05-31 00:19:30 +09:00
832f2fc00f
Call on_data_chunk_recv_callback only when stream is active
2014-05-29 22:18:52 +09:00
d113055899
nghttp2_hd: Use single buffer for an name/value pair
...
Previously we use 2 separate buffer for each name and value. The
problem is we would waste buffer space for name because it is usually
small. Also tuning buffer size for each buffer separately is not
elegant and current HTTP server practice is that one buffer for 1
name/value pair. This commit unifies 2 buffers into 1.
2014-05-28 23:33:37 +09:00
5e6a2fa256
Assert ctx->state >= 0 in huffman decoding
2014-05-28 00:30:11 +09:00
d733c87567
Make state in nghttp2_hd_huff_decode_context int16_t to make compiler happy
2014-05-26 21:50:54 +09:00
589d3e71a3
Merge branch 'misc' of https://github.com/alagoutte/nghttp2 into alagoutte-misc
2014-05-26 21:48:30 +09:00
db354b228a
Remove unused include (stdint.h)
2014-05-26 08:58:15 +02:00
9677788317
Don't count closed streams in nghttp2_session_want_{read,write}
2014-05-23 22:23:38 +09:00
78a55935ac
Define constant for the length of priority related fields
2014-05-22 21:41:43 +09:00
2aa84019c7
Define constants for ALTSVC frame parsing
2014-05-22 21:36:12 +09:00
1ac028e166
Take into account that pending_local_max_concurrent_stream could be too large
...
pending_local_max_concurrent_stream is, once local settings applied,
becomes NGHTTP2_INITIAL_MAX_CONCURRENT_STREAMS, which is very large
number. When adjusting number of streams, we have to take min of
local effective SETTINGS_MAX_CONCURRENT_STREAMS and pending one.
2014-05-16 22:32:08 +09:00
2778e4aafc
Remove useless debug code in nghttp2_stream_roots_add()
2014-05-16 22:30:59 +09:00
7b9a8acc22
Add HPACK deflation API
2014-05-13 23:42:55 +09:00
062d6a8398
Remove outdated comment
2014-05-12 22:58:05 +09:00
ad4a4ee567
Add missing library error code to nghttp2_error()
2014-05-12 22:58:04 +09:00
ab76468971
Return NGHTTP2_ERR_BUFFER_ERROR from nghttp2_hd_{deflate,inflate}_hd
...
It is generally useful to know what is the cause of the error. Since
we expose HPACK API, it is friendly to tell application the
insufficient buffer size is a culprit.
2014-05-12 22:58:04 +09:00
bc6d952361
Check max SETTINGS_HEADER_TABLE_SIZE in nghttp2_iv_check()
...
Hide NGHTTP2_MAX_HEADER_TABLE_SIZE from public API. Now it is defined
as ((1u << 31) - 1) in nghttp2_frame.h, which is sufficiently big
enough.
2014-05-12 21:28:49 +09:00
f85c592818
Fix compile error with clang -Wunreachable-code
2014-05-12 21:11:27 +09:00
9683f88e6a
Add NGHTTP2_DEFAULT_HEADER_TABLE_SIZE macro
...
Use this macro in Python sources. Python module constant
HD_DEFLATE_HD_TABLE_BUFSIZE_MAX was renamed as
DEFLATE_MAX_HEADER_TABLE_SIZE since the previous name was awkward.
2014-05-11 21:38:30 +09:00
2e5c7f598f
Fix bug HPACK deflater does not send context update after table size change
2014-05-11 21:25:27 +09:00
4fffd23dd3
Code cleanup
2014-05-11 13:53:42 +09:00
b187895e1d
nghttp2_bufs_remove: Prevent NULL from being passed to memcpy
2014-05-11 13:51:46 +09:00
dc791a641d
Update doc
2014-05-10 21:43:16 +09:00
0707720b11
Code cleanup
2014-05-10 18:27:53 +09:00
4c8d4f8a85
Code cleanup
2014-05-10 00:13:40 +09:00
3ebb3faf32
Remove nghttp2_ prefix from static function, part 2
2014-05-08 23:54:07 +09:00
65bbdf56cd
Remove nghttp2_ prefix from static function
2014-05-08 23:37:56 +09:00
3e3d51842b
Interleave stream DATA more naturally
...
We simulate resource sharing by decreasing weight. The thing is if
weight is wrapped, that item continues to send DATA until its weight
gets lowered under the other items. This commits fix this issue.
2014-05-08 23:07:29 +09:00
d2890dfb91
Remove adjust_priority_callback
...
Since we have stream ID immediately available from nghttp2_submit_*,
we don't need adjust_priority_callback.
2014-05-07 23:43:45 +09:00
e8de437d5c
Return new stream ID from nghttp2_submit_{request, headers, push_promise}
...
Previously stream ID was assigned just before HEADERS or PUSH_PROMISE
was serialized and nghttp2_submit_{request, headers, push_promise} did
not return stream ID. The application has to check assigned stream ID
using before_frame_send_callback. Now it is apparent that priority is
meant to DATA transfer only. Also application can reorder the
requests if it wants. Therefore we can assign stream ID in
nghttp2_submit_* functions and return stream ID from them. With this
change, now application does not have to check stream ID using
before_frame_send_callback and its code will be simplified.
2014-05-07 23:24:07 +09:00
51e79c5a3d
Remove debug output
2014-05-07 23:23:43 +09:00
8e22eadc76
Fix typo
2014-05-06 17:05:47 +02:00
9228e223fa
Remove NGHTTP2_ERR_GZIP error code
2014-05-06 23:42:57 +09:00
4f027c1562
libnghttp2: Remove dependency to zlib
...
We inherited gzip compression API from spdylay codebase. In spdylay,
the cost of having such API is almost free because spdylay requires
zlib for header compression. nghttp2 no longer uses gzip to header
compression. zlib dependency exists just for gzip compression API,
which is not an essential. So we decided to move gzip code to under
src and remove zlib dependency from libnghttp2 itself. As nghttp2
package, we depend on zlib to compile tools under src.
2014-05-06 23:10:50 +09:00
704f362804
nghttp2.h: Use hex style flag definition
2014-05-06 18:49:24 +09:00
e2535df505
Code cleanup
2014-05-06 18:39:04 +09:00
f207089604
Update doc
2014-05-06 18:34:48 +09:00
7b7b0ebcca
Update doc
2014-05-06 18:08:41 +09:00
8289943a58
nghttp2_frame: Add assertion to available buffer size in first buffer
2014-05-06 18:06:46 +09:00
56d6784d8d
nghttp2_frame: Return NGHTTP2_ERR_FRAME_SIZE_ERROR instead of .._BUFFER_ERROR
...
Also updates docs
2014-05-06 18:02:26 +09:00
9125499dd0
src: Implement per-frame DATA compression
...
Currently, nghttpd server only compresses files whose extensions are
one of .html, .js, .css and .txt. nghttp advertises its support of
per-frame compression in SETTINGS frame. To implement this feature,
we added 2 public API: nghttp2_session_get_remote_settings() and
nghttp2_gzip_inflate_finished().
2014-05-03 00:02:17 +09:00
3fc1d2dfaa
Merge branch 'gcc' of https://github.com/alagoutte/nghttp2 into alagoutte-gcc
2014-05-01 10:29:40 +09:00
855f39743a
Fix crash when indexed repr index=0
2014-05-01 09:06:54 +09:00
3c431da6aa
Fix bug that server treats reception of ENABLE_PUSH=0 as connection error
2014-05-01 08:38:28 +09:00
33a6851abe
Fix GCC build with -Werror
...
nghttp2_session.c:1615:9: error: C++ style comments are not allowed in ISO C90 [-Werror]
2014-04-30 17:09:06 +02:00
763cdc3499
Fix GCC when use -Wpedantic
...
nghttp2_stream.h:94:43: error: comma at end of enumerator list [-Werror=pedantic]
2014-04-30 17:09:05 +02:00
0f5c28ac46
Fix GCC when use -Wpedantic
...
nghttp2_hd.h:115:30: error: comma at end of enumerator list [-Werror=pedantic]
2014-04-30 17:09:05 +02:00
941236948f
Fix GCC when use -Wpedantic
...
nghttp2_int.h:50:33: error: comma at end of enumerator list [-Werror=pedantic]
2014-04-30 17:09:05 +02:00
660c536275
Extend namelen and valuelen in nghttp2_nv to size_t
2014-04-30 23:08:34 +09:00
52b74144ee
Fix 0 size malloc, part 2
2014-04-30 22:40:43 +09:00
1b79114d2d
Fix compiler warnings
2014-04-30 22:16:21 +09:00
ab634853df
Fix 0 size malloc
2014-04-30 22:09:02 +09:00
d2e64317ba
Code cleanup, include nghttp2_int.h explicitly to ensure debug macro
2014-04-30 22:08:32 +09:00
b2f07b1d8c
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Analyzer
2014-04-30 22:06:42 +09:00
eff5c7d0d0
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Analyzer
2014-04-30 22:06:42 +09:00
e00b8f1f73
Fix Dead Store (Dead assignement/Dead increment) warning found by Clang Analyzer
2014-04-30 22:06:42 +09:00
fe6b541233
Handle hd inflate buffer allocation failure
2014-04-30 11:32:05 +09:00
167a1102e0
Remove unused NGHTTP2_HD_MAX_BUFFER_LENGTH macro
2014-04-30 10:55:43 +09:00
d61208b394
Update doc
2014-04-30 10:49:19 +09:00
4cf023d94c
Update doc
2014-04-30 10:28:50 +09:00
3b4aedd566
Add HPACK decoder public API
2014-04-29 15:53:46 +09:00
8c5db539b3
Change NGHTTP2_MAX_HEADER_TABLE_SIZE to 256MiB
2014-04-28 22:50:43 +09:00
6d5f402380
Add nghttp2_adjust_priority_callback
...
Callback function invoked to adjust priority value for request
HEADERS.
Since the application doesn’t know stream ID when it submits
requests, it may not be able to add correct priority value to HEADERS
frame and forced to use follwing PRIORITY frame. The purpose of this
callback is give the chance to the application to adjust priority
value with the latest information it has just before transmission so
that correct priority is included in HEADERS frame and it doesn’t
have to send additional PRIORITY frame.
2014-04-27 14:48:43 +09:00
cc7929bdcc
Fix possible SIGFPE
2014-04-27 14:40:10 +09:00
59e42c1c69
Update doc
2014-04-25 01:39:40 +09:00
d49733a5c9
Declare h2-12 for now
2014-04-25 01:33:29 +09:00
052be3296c
Implement compressed DATA
...
The library interface supports compressed DATA. The library does not
deflate nor inflate data payload. When sending data, an application
has to compress data and set NGHTTP2_DATA_FLAG_COMPRESSED to
data_flags parameter in nghttp2_data_source_read_callback. On
receiving, flags parameter in nghttp2_on_data_chunk_recv_callback
includes NGHTTP2_FLAG_COMPRESSED. An application should check the
flags and inflate data as necessary. Since compression context is per
frame, when DATA is seen in nghttp2_on_frame_recv_callback, an
application should reset compression context.
2014-04-25 01:27:18 +09:00
6bb410d603
Implement BLOCKED frame
2014-04-25 00:38:24 +09:00
2d4b92fc2b
Merge branch 'priority'
2014-04-24 23:48:37 +09:00
ee26469cd9
Handle circular dependency
...
Handle the situation if a stream is told to depend on its descendant.
This is what
http://tools.ietf.org/html/draft-ietf-httpbis-http2-12#section-5.3.3
says.
2014-04-24 23:44:34 +09:00
853c9888d9
Distribute effective weight among only streams with marked as top
...
If stream with dpri value of no_data, we check any its descendant has
stream with dpri value of top. If so, we have to distribute of its
portion of weight to its descendants.
2014-04-24 23:37:40 +09:00
5aa0a0d099
Check protocol length so that scanner don't overrun buffer
2014-04-22 23:20:33 +09:00
aa4d43f31e
Allow exclusive dependency to stream 0
2014-04-17 21:18:18 +09:00
ac86b51e37
Implement simplified dependency based priority
2014-04-15 22:55:07 +09:00
27a91fc30e
Allow NGHTTP2_PRIORITY_TYPE_NONE in nghttp2_submit_{request,headers}
2014-04-10 23:29:56 +09:00
ece6521d26
Check stream availability when sending ALTSVC with stream_id != 0
2014-04-10 23:27:10 +09:00
792938d410
Update doc
2014-04-09 00:16:04 +09:00
9b3d5a8be5
Harden check for submit functions
...
nghttp2_submit_{headers,request}: Return NGHTTP2_ERR_INVAILD_ARGUMENT
if pri_spec->type is invalid.
nghttp2_submit_push_promise: Return NGHTTP2_ERR_PROTO if issued by
client.
nghttp2_submit_altsvc: Return NGHTTP2_ERR_PROTO instead of
NGHTTP2_ERR_INVALID_STATE if issued by client.
2014-04-09 00:13:11 +09:00
7563839756
Update doc
2014-04-06 21:13:44 +09:00
ffcbffc28b
Revert f763d76110
2014-04-06 17:56:48 +09:00
1aa69e334d
Fix compile error on 32-bit systems
2014-04-06 17:34:44 +09:00
f763d76110
Revert NGHTTP2_DATA_PAYLOADLEN to 4086
2014-04-05 23:42:37 +09:00
8f23c0c38b
Name unnamed union in nghttp2_priority_spec so that we can be C90 compatible
2014-04-05 18:40:44 +09:00
c1060f0d48
Announce h2-11
2014-04-05 18:26:48 +09:00
e7ad3633c7
nghttp2_data_source_read_callback: Replace eof with uint32_t *data_flags
...
Replace int *eof with uint32_t *data_flags so that we can easily
extend functionality if we have to (but we don't do if possible).
2014-04-05 17:59:24 +09:00
124da7720f
Fix compile error
2014-04-05 17:45:06 +09:00
d668d2448b
Hide session option from public API
...
To make adding new option easier, we decided to make the details of
option struct private and hide it from public API. We provide
functions to set individual option value.
2014-04-04 21:57:47 +09:00
21ab2f135b
Connection error if client changes SETTINGS_ENABLE_PUSH to nonzero
2014-04-04 20:36:09 +09:00
1e38ceb1cd
Allow empty SETTINGS in upgrade
2014-04-04 20:23:46 +09:00
5d80d18f31
Cosmetic change
2014-04-03 16:06:03 +09:00
37e1626478
Update doc
2014-04-03 16:01:30 +09:00
6cddfaf263
nghttp2_stream_resume_deferred_data: Call stream_update_dep_on_attach_data
...
.. instead of nghttp2_stream_attach_data() internal API
2014-04-03 15:52:21 +09:00
ac2a8ef4a2
Fix bug that transfer stuck when stream marked as top is deferred
2014-04-03 15:48:51 +09:00
b1edb1f3ae
Don't index name/value pair bearing NO_INDEX flag when forwarding it
2014-04-03 11:22:11 +09:00
c53c1dc669
nghttp2_session_resume_data: Return error if no deferred data exist
2014-04-03 00:01:35 +09:00
580a19e097
nghttp2_stream_detach_deferred_data -> nghttp2_stream_resume_deferred_data
2014-04-02 22:58:06 +09:00
ef40879b5f
Refactor nghttp2_stream
...
Combine deferred_data and data into data_item and merge deferred_flags
into flags.
2014-04-02 22:55:49 +09:00
2685e3405f
Rename NGHTTP2_DATA_PAYLOAD_LENGTH as NGHTTP2_DATA_PAYLOADLEN
2014-04-02 20:35:07 +09:00
9c4c99bf96
Adjust transmission frame buffer size to support maximum payload size
2014-04-02 20:33:01 +09:00
c9f90924a9
Add flags parameter to nghttp2_on_header_callback
2014-04-02 02:10:35 +09:00
e5b0303481
Update huffman codes
2014-04-02 01:44:39 +09:00
b1722cbe28
Update static table
2014-04-02 01:30:50 +09:00
7877b676e3
Honor NGHTTP2_NV_FLAG_NO_INDEX in deflater and inflater
2014-04-02 01:25:44 +09:00
c55df4a30b
Fix compile error with --enable-werror
2014-04-02 01:18:27 +09:00
24cb90806d
Add flags to nghttp2_nv structure
...
This is preliminary change for upcoming HPACK updates. The flags are
used to determine the name/value pair is indexable or not.
2014-04-01 23:17:50 +09:00
da5db205ca
Make group weight range [1, 256], inclusive
...
We do -+1 on serialization and deserialization since the field is 1
byte. This change also parameterized range so that we can change it
easily.
2014-04-01 22:54:20 +09:00
f2d945734e
Rename framebuflen as framerv, cause it is not a length
2014-04-01 21:59:26 +09:00
f5ead55f0e
Check payload length when submitting GOAWAY and ALTSVC
2014-04-01 21:55:29 +09:00
f785e56dba
Implement ALTSVC frame
2014-04-01 21:47:51 +09:00
6afb7442b5
Adjust weight when pushing data to queue
2014-03-31 23:01:05 +09:00
b85e2ab7f7
Share stream_group weight among streams marked as top
2014-03-31 22:51:33 +09:00
34581d830d
Define NGHTTP2_CLEARTEXT_PROTO_VERSION_ID
...
This identifier string is used if HTTP/2 is used over cleartext TCP.
2014-03-30 21:30:47 +09:00
60a2c260a5
Define NGHTTP2_CLIENT_CONNECTION_PREFACE macro
...
NGHTTP2_CLIENT_CONNECTION_PREFACE has the same content with
NGHTTP2_CLIENT_CONNECTION_HEADER, which is now obsoleted by
NGHTTP2_CLIENT_CONNECTION_PREFACE.
2014-03-30 21:02:25 +09:00
ab2dc5967d
Replace HTTP/2.0 with HTTP/2
2014-03-30 19:26:37 +09:00
705051ceb7
Update doc
2014-03-30 19:00:42 +09:00
d3962becf4
Ignore priority request if resultant tree has cycle
2014-03-30 18:48:32 +09:00
21d5986157
Fail nghttp2_submit_settings if there is pending SETTINGS frame in-flight
...
pending_local_max_concurrent_stream is now set in
nghttp2_session_add_settings, rather than after frame was sent.
2014-03-30 18:07:52 +09:00
Tatsuhiro Tsujikawa
Alexis La Goutte