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

Fix nghttp2_active_outbound_item is not reset on DATA deferred

This commit is contained in:
Tatsuhiro Tsujikawa 2014-02-11 18:43:45 +09:00
parent 16b5e99e88
commit 6364ae1a98
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nghttp2_session.c
View File

@ -378,6 +378,8 @@ static void nghttp2_session_ob_pq_free(nghttp2_pq *pq)
static void nghttp2_active_outbound_item_reset static void nghttp2_active_outbound_item_reset
(nghttp2_active_outbound_item *aob) (nghttp2_active_outbound_item *aob)
{ {
DEBUGF(fprintf(stderr, "reset nghttp2_active_outbound_item\n"));
DEBUGF(fprintf(stderr, "aob->item = %p\n", aob->item));
nghttp2_outbound_item_free(aob->item); nghttp2_outbound_item_free(aob->item);
free(aob->item); free(aob->item);
aob->item = NULL; aob->item = NULL;
@ -1321,6 +1323,8 @@ static ssize_t nghttp2_session_prep_frame(nghttp2_session *session,
next_readmax = nghttp2_session_next_data_read(session, stream); next_readmax = nghttp2_session_next_data_read(session, stream);
if(next_readmax == 0) { if(next_readmax == 0) {
nghttp2_stream_defer_data(stream, item, NGHTTP2_DEFERRED_FLOW_CONTROL); nghttp2_stream_defer_data(stream, item, NGHTTP2_DEFERRED_FLOW_CONTROL);
session->aob.item = NULL;
nghttp2_active_outbound_item_reset(&session->aob);
return NGHTTP2_ERR_DEFERRED; return NGHTTP2_ERR_DEFERRED;
} }
framebuflen = nghttp2_session_pack_data(session, framebuflen = nghttp2_session_pack_data(session,
@ -1331,6 +1335,8 @@ static ssize_t nghttp2_session_prep_frame(nghttp2_session *session,
data_frame); data_frame);
if(framebuflen == NGHTTP2_ERR_DEFERRED) { if(framebuflen == NGHTTP2_ERR_DEFERRED) {
nghttp2_stream_defer_data(stream, item, NGHTTP2_DEFERRED_NONE); nghttp2_stream_defer_data(stream, item, NGHTTP2_DEFERRED_NONE);
session->aob.item = NULL;
nghttp2_active_outbound_item_reset(&session->aob);
return NGHTTP2_ERR_DEFERRED; return NGHTTP2_ERR_DEFERRED;
} else if(framebuflen == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) { } else if(framebuflen == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
r = nghttp2_session_add_rst_stream(session, data_frame->hd.stream_id, r = nghttp2_session_add_rst_stream(session, data_frame->hd.stream_id,
@ -1803,6 +1809,7 @@ int nghttp2_session_send(nghttp2_session *session)
} }
nghttp2_outbound_item_free(item); nghttp2_outbound_item_free(item);
free(item); free(item);
nghttp2_active_outbound_item_reset(&session->aob);
if(framebuflen == NGHTTP2_ERR_HEADER_COMP) { if(framebuflen == NGHTTP2_ERR_HEADER_COMP) {
/* If header compression error occurred, should terminiate /* If header compression error occurred, should terminiate