diff options
author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-05-10 17:23:49 +0200 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-05-11 04:18:30 +0000 |
commit | 9e860267edd5032c8e0e2aef3c04dc8d31ecd4ab (patch) | |
tree | e4749670e9cad3c36ec00097fef967316ca36d1d /epan/nghttp2 | |
parent | 6b158da3fedba4b67bbb74ecf4c4e30e227a2165 (diff) | |
download | wireshark-9e860267edd5032c8e0e2aef3c04dc8d31ecd4ab.tar.gz |
HTTP2: Update to libnghttp2 0.7.14
Change-Id: Ib4cbe5cd876956bffeea81011a94296333ff1e9c
Reviewed-on: https://code.wireshark.org/review/8379
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/nghttp2')
-rw-r--r-- | epan/nghttp2/nghttp2.h | 19 | ||||
-rw-r--r-- | epan/nghttp2/nghttp2_hd.c | 10 | ||||
-rw-r--r-- | epan/nghttp2/nghttp2_hd.h | 2 | ||||
-rw-r--r-- | epan/nghttp2/nghttp2ver.h | 4 |
4 files changed, 17 insertions, 18 deletions
diff --git a/epan/nghttp2/nghttp2.h b/epan/nghttp2/nghttp2.h index a32104ad64..5bd42edbf5 100644 --- a/epan/nghttp2/nghttp2.h +++ b/epan/nghttp2/nghttp2.h @@ -2951,13 +2951,13 @@ nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec); * If |data_prd| is not ``NULL``, it provides data which will be sent * in subsequent DATA frames. In this case, a method that allows * request message bodies - * (http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9) must - * be specified with ``:method`` key in |nva| (e.g. ``POST``). This - * function does not take ownership of the |data_prd|. The function - * copies the members of the |data_prd|. If |data_prd| is ``NULL``, - * HEADERS have END_STREAM set. The |stream_user_data| is data - * associated to the stream opened by this request and can be an - * arbitrary pointer, which can be retrieved later by + * (https://tools.ietf.org/html/rfc7231#section-4) must be specified + * with ``:method`` key in |nva| (e.g. ``POST``). This function does + * not take ownership of the |data_prd|. The function copies the + * members of the |data_prd|. If |data_prd| is ``NULL``, HEADERS have + * END_STREAM set. The |stream_user_data| is data associated to the + * stream opened by this request and can be an arbitrary pointer, + * which can be retrieved later by * `nghttp2_session_get_stream_user_data()`. * * This function returns assigned stream ID if it succeeds, or one of @@ -3564,7 +3564,10 @@ NGHTTP2_EXTERN int nghttp2_nv_compare_name(const nghttp2_nv *lhs, * { * int rv; * rv = nghttp2_select_next_protocol(out, outlen, in, inlen); - * if(rv == 1) { + * if (rv == -1) { + * return SSL_TLSEXT_ERR_NOACK; + * } + * if (rv == 1) { * ((MyType*)arg)->http2_selected = 1; * } * return SSL_TLSEXT_ERR_OK; diff --git a/epan/nghttp2/nghttp2_hd.c b/epan/nghttp2/nghttp2_hd.c index ea1d61430a..636d0210db 100644 --- a/epan/nghttp2/nghttp2_hd.c +++ b/epan/nghttp2/nghttp2_hd.c @@ -1157,15 +1157,11 @@ static nghttp2_hd_entry *add_hd_table_incremental(nghttp2_hd_context *context, } static int name_eq(const nghttp2_nv *a, const nghttp2_nv *b) { - return a->namelen == b->namelen && - a->name[a->namelen - 1] == b->name[a->namelen - 1] && - memeq(a->name, b->name, a->namelen); + return a->namelen == b->namelen && memeq(a->name, b->name, a->namelen); } static int value_eq(const nghttp2_nv *a, const nghttp2_nv *b) { - return a->valuelen == b->valuelen && - a->value[a->valuelen - 1] == b->value[a->valuelen - 1] && - memeq(a->value, b->value, a->valuelen); + return a->valuelen == b->valuelen && memeq(a->value, b->value, a->valuelen); } typedef struct { @@ -1757,7 +1753,7 @@ static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater, rv = #endif nghttp2_bufs_remove_copy(&inflater->nvbufs, - buf + ent_name->nv.namelen + 1); + buf + ent_name->nv.namelen + 1); assert(ent_name->nv.namelen + 1 + rv == buflen); nghttp2_bufs_reset(&inflater->nvbufs); diff --git a/epan/nghttp2/nghttp2_hd.h b/epan/nghttp2/nghttp2_hd.h index 204d36ae98..8e0ac2ea19 100644 --- a/epan/nghttp2/nghttp2_hd.h +++ b/epan/nghttp2/nghttp2_hd.h @@ -109,7 +109,7 @@ typedef enum { NGHTTP2_TOKEN_CONNECTION, NGHTTP2_TOKEN_KEEP_ALIVE, NGHTTP2_TOKEN_PROXY_CONNECTION, - NGHTTP2_TOKEN_UPGRADE, + NGHTTP2_TOKEN_UPGRADE } nghttp2_token; typedef enum { diff --git a/epan/nghttp2/nghttp2ver.h b/epan/nghttp2/nghttp2ver.h index 8e67b275de..af67a34c18 100644 --- a/epan/nghttp2/nghttp2ver.h +++ b/epan/nghttp2/nghttp2ver.h @@ -29,7 +29,7 @@ * @macro * Version number of the nghttp2 library release */ -#define NGHTTP2_VERSION "0.7.13" +#define NGHTTP2_VERSION "0.7.14" /** * @macro @@ -37,6 +37,6 @@ * release. This is a 24 bit number with 8 bits for major number, 8 bits * for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203. */ -#define NGHTTP2_VERSION_NUM 0x00070d +#define NGHTTP2_VERSION_NUM 0x00070e #endif /* NGHTTP2VER_H */ |