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
74daa16a1c
Retain incoming closed streams for dependency tree
...
The number of closed stream to keep is limited by
MAX_CONCURRENT_STREAMS - current active stream.
2014-03-30 17:41:54 +09:00
a9d97d9d35
Update doc
2014-03-30 01:34:13 +09:00
c12b6bc360
Call on_stream_close_callback for a stream in reserved state
...
This is useful because application may allocate resources for it and
wants to free the resources if they are not used anymore.
2014-03-30 01:24:16 +09:00
58da463ad6
Make deflater bad state if parsing HEADERS/PUSH_PROMISE failed
2014-03-30 01:24:16 +09:00
36c8de9da5
Limit the number of streams in one dependency tree
2014-03-30 01:24:16 +09:00
f7162ab702
Implement dependency based priority
2014-03-30 01:24:16 +09:00
dbb82b0f9c
Make opaque_data parameter in nghttp2_submit_goaway const
2014-03-22 19:05:58 +09:00
e1eebf08fb
Support DEBUG_DATA in GOAWAY again
2014-03-22 18:59:59 +09:00
01586f473d
Wrap small inbound buffer by nghttp_buf
2014-03-22 18:27:38 +09:00
3c631b5625
Code cleanup
2014-03-22 17:16:25 +09:00
774cf88f68
Don't add RST_STREAM frame if stream is in NGHTTP2_STREAM_CLOSING
2014-03-22 00:51:40 +09:00
1dfe2f8670
Add nghttp2_session_get_stream_remote_window_size public API function
2014-03-22 00:34:25 +09:00
d0fbbe6932
Less cryptic debug message
2014-03-20 00:27:39 +09:00
c945d4ebbe
Fix compile error with --enable-debug
2014-03-19 23:24:46 +09:00
68b392817b
nghttp2_bufs: Add chunk_keep to specify the number of buffers to keep on reset
2014-03-16 21:38:13 +09:00
5b81f7c713
Don't show PAD_HIGH and PAD_LOW flags to user callback
2014-03-14 21:53:03 +09:00
2ec4b10805
Add nghttp2_buf tests
2014-03-14 21:40:14 +09:00
781d1a2b70
Code cleanup
2014-03-14 02:23:50 +09:00
142b433533
nghttp2_hd: Treat prematurely ended compressed header block as error properly
2014-03-14 00:52:44 +09:00
344d663e90
deflate_hd: Fix mishandled error return from emit_indexed_block
2014-03-14 00:25:03 +09:00
d48eca60cf
Fix broken nghttp2_bufs_avail
2014-03-14 00:24:34 +09:00
aefc0d1ebb
Use calloc instead of malloc + memset; remove useless memset
2014-03-13 23:27:14 +09:00
1be8d1b797
inflate_header_block: Issue RST_STREAM if header decompression failed
2014-03-13 23:02:33 +09:00
0fa4779d38
Don't call on_frame_recv_callback after stream close or being closed
2014-03-13 22:49:37 +09:00
d07bb1ddff
Rework outbound frame buffers
2014-03-13 22:11:02 +09:00
0666a73e10
Remove nghttp2_buffer
2014-03-11 21:20:51 +09:00
3f56c938d8
nghttp2_hd: Use nghttp2_bufs, avoiding realloc()
2014-03-11 21:18:28 +09:00
7b2d585896
Return 0 if nghttp2_session_prep_frame succeeds rather than frame length
2014-03-11 02:15:05 +09:00
74f899fc01
Replace NGHTTP2_MAX_FRAME_LENGTH with NGHTTP2_MAX_PAYLOADLEN
2014-03-11 02:01:08 +09:00
e803c6b65e
Replace NGHTTP2_FRAME_HEAD_LENGTH with NGHTTP2_FRAME_HDLEN
2014-03-11 01:55:42 +09:00
358b4386d3
Introduce nghttp2_buf to ease buffer management
2014-03-11 01:47:38 +09:00
54dab50015
Support END_SEGMENT in nghttp2_submit_data()
2014-03-06 00:19:02 +09:00
b60679808b
Filter supported flags in received frame
2014-03-05 23:25:42 +09:00
547d6d1fb5
Use 4086 as max DATA payload size to make DATA frame fit into 4K buffer
2014-03-05 22:48:17 +09:00
79c5032708
nghttp2_hd: Fix crash with multiple threads execution
2014-03-03 00:53:04 +09:00
979feaecc6
Mitigate heap fragmentation when lots of concurrent http2 sessions run
2014-03-02 16:34:23 +09:00
1fee4fd2df
nghttp2_hd: Fail inflate immediately if ctx.bad is nonzero
...
Doing inflation after error produces invalid results, especially, if
it is in NGHTTP2_HD_STATE_READ_INDEX, the inflater->left could be 0,
which causes assertion error. Add sanity assertion for index
2014-02-26 23:20:52 +09:00
18357512ed
nghttp2_hd: Fix integer decoding bug
2014-02-26 21:44:48 +09:00
d1c1deaf03
Add promised_stream_user_data parameter to nghttp2_submit_push_promise
...
This is very useful to associate application specific data to promised
stream.
nghttp2_nv_array_copy now does not complain the header field is large.
2014-02-25 00:26:12 +09:00
5e88be0b2c
Update doc
2014-02-21 21:29:23 +09:00
fc25143418
Remove END_PUSH_PROMISE in favor of END_HEADERS
2014-02-21 21:23:51 +09:00
9703c5de5c
Code cleanup
2014-02-20 23:12:42 +09:00
3395f7158f
Strict handling of max concurrent streams
...
Exceeding ACKed max concurrent streams results in connection error.
This change fixes the bug that num_{incoming,outgoing}_streams
is decremented wrongly if a stream is in reserved state and
RST_STREAM is send and its state is changed to NGHTTP2_STREAM_CLOSING.
This change also fixes the bug that transmission of push response
HEADERS does not increase num_outgoing_streams.
2014-02-20 23:10:32 +09:00
30b3855194
nghttp2_session_mem_send tiny doc fix
...
Patch from Dave Beckett
2014-02-19 21:18:24 +09:00
4ced1c1622
Code cleanup
2014-02-19 01:08:52 +09:00
2966ad2d15
Update doc
2014-02-19 00:16:25 +09:00
649586fff6
Add nghttp2_session_mem_send() API function
...
This function behaves like nghttp2_session_send(), but it does not
use nghttp2_send_callback to send data. Instead, it returns the
serialized data to trasmit and its length to the caller.
2014-02-18 23:23:11 +09:00
62b73133e5
Code cleanup
2014-02-15 18:56:20 +09:00
66832e9f4e
Allow NGHTTP2_FLAG_END_SEGMENT in nghttp2_submit_headers()
2014-02-15 18:55:52 +09:00
0da79865b8
Don't set PAD_HIGH and PAD_LOW flags to HEADERS/PUSH_PROMISE object to user cb
2014-02-15 17:12:17 +09:00
3f3f258cd6
Add padding to PUSH_PROMISE
2014-02-15 16:30:43 +09:00
1e95c8b313
Allow always max 1024 padding for HEADERS
...
We need paddings regardless of payload and frame boundary to mitigate
certain attacks.
Since we handles CONTINUATION internally, we don't show FLAG_PAD_HIGH
and PAD_LOW flags of HEADERS in nghttp/nghttpd. We just show the
total paddings in HEADERS + CONTINUATION.
2014-02-15 01:34:04 +09:00
622f783675
Disallow PUSH_PROMISE from client side
2014-02-14 16:12:04 +09:00
7ab4206269
Tear down connection if SETTINGS makes window size overflow
2014-02-14 16:08:39 +09:00
fd88c6160d
HPACK post -05 updates
...
* Use 1 Huffman code table for both request and response
* Remove complicated deflater side table size management
* Add encoding context update
* Fix memory leak in inflater
2014-02-13 23:22:52 +09:00
082876d92d
Contribute flow control window for each byte PAD_HIGH and _LOW in DATA
...
This may help the pathological situation where window is too small.
2014-02-12 21:35:40 +09:00
c7a17093cb
Fix compile errors with --enable-maintainer-mode
2014-02-11 21:39:35 +09:00
bac31e844a
Add more debug output
2014-02-11 21:35:41 +09:00
7822bbd7e8
Fix PAD_HIGH and PAD_LOW are not counted in flow control
2014-02-11 21:30:44 +09:00
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
cf0b880b15
Error if undefined SETTINGS ID is detected in nghttp2_iv_check
2014-02-11 16:53: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
e78a2100ec
Merge branch 'master' into draft-10
2014-02-11 16:03:42 +09:00
cacf4ecf26
Fix premature header block is not treated as connection error
2014-02-11 16:00:59 +09:00
cbbecfeb41
Fix broken session_detect_idle_stream()
2014-02-11 15:35:44 +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
256c97d89b
Change default padding size to 16
2014-02-09 18:27:34 +09:00
ba95cd936d
Fix flow control error because padding is excluded
2014-02-09 18:26:46 +09:00
a4070be518
Fix on_frame_recv_callback called multiple times if CONTINUATION is involved
2014-02-09 17:00:29 +09:00
dffa078c11
Update doc
2014-02-09 16:49:24 +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
9c30ed1a64
Update flags
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
d584888601
Renumber frame types, flags and error codes
2014-02-06 21:49:16 +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
112b49cb9a
Renumber SETTINGS
2014-02-06 00:26:12 +09:00
c79adf6997
Remove flow control disabling feature
2014-02-06 00:23:20 +09:00
196406da0e
Change protocol identifier to h2-10
2014-02-05 23:37:27 +09:00
9fcd35d063
Update doc
2014-02-05 23:04:42 +09:00
8c0730c281
Update doc
2014-02-01 19:46:59 +09:00
8be17f077a
Add nghttp2_check_header_name and nghttp2_check_header_value APIs
...
These are promoted to public API from src/http2.h
2014-02-01 19:31:50 +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
652228a9d2
Update doc
2014-01-29 21:35:39 +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
1382067976
Update doc
2014-01-27 23:31:42 +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
04b7350719
Fix compile error
2014-01-27 21:14:41 +09:00
58cbecbf95
nghttp2_buffer: Set minimum buffer size to 8
2014-01-27 00:48:45 +09:00
545f24bc1b
Remove nghttp2_on_frame_recv_parse_error_callback
2014-01-26 23:23:07 +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
f8a446fbeb
nghttp2_hd: Rewrite huffman decoding
2014-01-24 21:56:19 +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
201ab1a140
nghttp2_hd: Adjust maximum size to index based on table size
2014-01-21 21:49:53 +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
2222b5ab0d
Don't return NGHTTP2_ERR_STREAM_CLOSED when submitting DATA, PRIORITY, WU
...
Remove the check to see that stream exists at the time when submitting
DATA, PRIORITY and WINDOW_UPDATE. We will do this check when we actually
serialize and send them off to the network (or application provided
buffer).
2014-01-18 16:19:28 +09:00
0f30fb98a9
Update doc
2014-01-18 00:35:41 +09:00
e960c56aad
Don't call on_request_recv_callback if header decompression failed
2014-01-17 23:49:40 +09:00
3882bbebdc
Update doc
2014-01-17 22:55:36 +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
1daf6de102
Update doc
2014-01-17 09:41:39 +09:00
073e6d3a01
nghttp2_hd: Remove unused variables
2014-01-17 09:36:38 +09:00
707a0b4103
Move name/value validation functions to src
...
nghttp2 library itself now accept octet header/value pairs,
completely not restricted by HTTP/1 header name/value rule.
The applications may impose restriction about them using
validators.
2014-01-17 02:16:53 +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
5d788e9753
nghttp2_hd: Move pointer variables before size_t
2014-01-12 19:28:57 +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
95b0b6cb79
Update doc
2014-01-09 21:42:44 +09:00
fe1a39ed10
Allow client side to send PUSH_PROMISE
2014-01-09 21:39:29 +09:00
dacfecf41a
lib, src, hdtest: Ensure that config.h is included
2014-01-08 23:30:02 +09:00
63e7b21b35
nghttp2_hd: Fix lower bound search in static table
2014-01-08 21:32:39 +09:00
0fb4d32d6a
nghttp2_hd: Binary search static table
2014-01-07 23:41:09 +09:00
468d0fccd3
nghttp2_hd: Use hash to speed up name/value pair search
2014-01-07 22:43:34 +09:00
d703197a50
nghttp2_hd: Mitigate timing attack
2014-01-07 21:51:48 +09:00
9eb031ce83
nghttp2_hd: Avoid nghttp2_hd_huff_decode_count
...
Huffman decoding is costly. It is faster to do geometric realloc
than calling nghttp2_hd_huff_decode_count to know the length in
advance.
2014-01-07 21:44:56 +09:00
4ac1652c70
nghttp2_hd: Remove invalid nghttp2_downcase call
2014-01-07 21:18:45 +09:00
295a01ef91
Reformat valid character table for header field name/value pair
2014-01-04 11:19:07 +09:00
888792a949
nghttp2_hd: Allow HTAB and obs-text characters for field-content
2014-01-03 22:46:40 +09:00
74d82aac56
Update doc
2014-01-02 01:00:11 +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
779366640a
Update doc
2013-12-24 19:27:03 +09:00
794633f894
Add nghttp2_session_set_stream_user_data API function
2013-12-23 17:40:34 +09:00
2c1739a24e
Add comment to category in HEADERS and reorder
2013-12-22 19:23:37 +09:00
7c4dbb6ffc
nghttp2_hd: Don't malloc if huffman encoded string has 0 length
2013-12-19 23:19:14 +09:00
7a9eca1f7d
nghttp2_hd: Simplify huffman encode
2013-12-19 23:02:48 +09:00
5ca0cfa018
nghttp2_hd: Search hd table once
2013-12-18 21:45:15 +09:00
12144acf4d
nghttp2_hd: Check last byte of huffman encoded byte string strictly
2013-12-18 21:27:16 +09:00
01266182e9
nghttp2_hd: Match deflate_hd_tablelen to hd_table.len on decoder side
2013-12-17 21:39:21 +09:00
595493a0ec
Add debug output in nghttp2_hd
2013-12-16 23:54:20 +09:00
650f63c728
Fail session on the reception of DATA in closed stream or illegal state
2013-12-15 16:23:01 +09:00
65e54ca7b0
Add nghttp2_free()
2013-12-14 23:49:16 +09:00
bc7473182c
Update doc
2013-12-14 19:18:14 +09:00
0867b57c39
Update doc
2013-12-14 18:59:09 +09:00
e61876ccbd
nghttp2_hd: Provide dedicated function to enable no reference set feature
2013-12-14 18:48:41 +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
bcee1b27a7
Update doc
2013-12-12 00:30:15 +09:00
e17f888944
Lower priority by constant value
2013-12-11 23:20:59 +09:00
9d49f9a356
Add copyright notice
2013-12-09 23:25:59 +09:00
6c77cec270
Remove nghttp2_submit_* API functions which has char **nv parameter
...
The nghttp2_submit_{request,response}2 functions are renamed as
nghttp2_submit_{request, response}.
2013-12-08 21:39:43 +09:00
d6212a6055
Fix doc
2013-12-08 17:35:14 +09:00
d773b42a2d
Ensure that pri goes to the lowest value
2013-12-07 16:14:39 +09:00
6ea91e57e0
Adjust struct/class alignment
2013-12-06 23:17:38 +09:00
84d1fffb3f
Announce HTTP-draft-09/2.0
2013-12-05 23:23: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
3fde4c7669
nghttp2_map: Code cleanup
2013-12-05 19:26:16 +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
2a83fc7559
Add nghttp2_submit_response2
2013-11-28 21:35:48 +09:00
e57b3a2139
Set protocol ID to draft-08 temporarily
2013-11-21 21:58:45 +09:00
Tatsuhiro Tsujikawa
Alexis La Goutte