walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Call nghttp2_hd_end_headers from nghttp2_hd_deflate_hd

This commit is contained in:
Tatsuhiro Tsujikawa 2013-09-03 21:41:22 +09:00
parent dd4151330e
commit 1723912f35
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/nghttp2_hd.c
View File

@ -874,6 +874,7 @@ ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_context *deflater,
nghttp2_hd_entry *ent = deflater->hd_table[i]; nghttp2_hd_entry *ent = deflater->hd_table[i];
ent->flags &= ~(NGHTTP2_HD_FLAG_EMIT | NGHTTP2_HD_FLAG_IMPLICIT_EMIT); ent->flags &= ~(NGHTTP2_HD_FLAG_EMIT | NGHTTP2_HD_FLAG_IMPLICIT_EMIT);
} }
nghttp2_hd_end_headers(deflater);
return offset - nv_offset; return offset - nv_offset;
fail: fail:
deflater->bad = 1; deflater->bad = 1;

14
lib/nghttp2_hd.h
View File

@ -164,6 +164,14 @@ void nghttp2_hd_inflate_free(nghttp2_hd_context *inflater);
* |*buf_ptr| may change. |*buf_ptr| and |*buflen_ptr| are updated * |*buf_ptr| may change. |*buf_ptr| and |*buflen_ptr| are updated
* accordingly. * accordingly.
* *
* This function copies necessary data into |*buf_ptr|. After this
* function returns, it is safe to delete the |nva|.
*
* TODO: The rest of the code call nghttp2_hd_end_headers() after this
* call, but it is just a regacy of the first implementation. Now it
* is called in this function and the caller does not need to call it
* by itself.
*
* This function returns the number of bytes outputted if it succeeds, * This function returns the number of bytes outputted if it succeeds,
* or one of the following negative error codes: * or one of the following negative error codes:
* *
@ -183,6 +191,12 @@ ssize_t nghttp2_hd_deflate_hd(nghttp2_hd_context *deflater,
* result on successful decompression. The caller must free |*nva_ptr| * result on successful decompression. The caller must free |*nva_ptr|
* using nghttp2_nv_array_del(). * using nghttp2_nv_array_del().
* *
* The |*nva_ptr| includes pointers to the memory region in the
* |in|. The caller must retain the |in| while the |*nva_ptr| is
* used. After the use of |*nva_ptr| is over, if the caller intends to
* inflate another set of headers, the caller must call
* nghttp2_hd_end_headers().
*
* This function returns the number of name/value pairs in |*nva_ptr| * This function returns the number of name/value pairs in |*nva_ptr|
* if it succeeds, or one of the following negative error codes: * if it succeeds, or one of the following negative error codes:
* *