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

nghttp2_stream_resume_deferred_data: Call stream_update_dep_on_attach_data 

.. instead of nghttp2_stream_attach_data() internal API
This commit is contained in:
Tatsuhiro Tsujikawa 2014-04-03 15:52:21 +09:00
parent ac2a8ef4a2
commit 6cddfaf263
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/nghttp2_stream.c
View File

@ -332,19 +332,14 @@ int nghttp2_stream_attach_data(nghttp2_stream *stream,
nghttp2_outbound_item *data_item, nghttp2_outbound_item *data_item,
nghttp2_pq *pq) nghttp2_pq *pq)
{ {
/* This function may be called when stream->data_item is not-NULL.
In this case, stream->data_item == data_item. */
assert((stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL) == 0); assert((stream->flags & NGHTTP2_STREAM_FLAG_DEFERRED_ALL) == 0);
assert(stream->data_item == NULL);
if(stream->data_item) {
assert(stream->data_item == data_item);
} else {
stream->data_item = data_item;
}
DEBUGF(fprintf(stderr, "stream: stream=%d attach data=%p\n", DEBUGF(fprintf(stderr, "stream: stream=%d attach data=%p\n",
stream->stream_id, data_item)); stream->stream_id, data_item));
stream->data_item = data_item;
return stream_update_dep_on_attach_data(stream, pq); return stream_update_dep_on_attach_data(stream, pq);
} }
@ -377,9 +372,12 @@ int nghttp2_stream_resume_deferred_data(nghttp2_stream *stream,
{ {
assert(stream->data_item); assert(stream->data_item);
DEBUGF(fprintf(stderr, "stream: stream=%d resume data=%p\n",
stream->stream_id, stream->data_item));
stream->flags &= ~NGHTTP2_STREAM_FLAG_DEFERRED_ALL; stream->flags &= ~NGHTTP2_STREAM_FLAG_DEFERRED_ALL;
return nghttp2_stream_attach_data(stream, stream->data_item, pq); return stream_update_dep_on_attach_data(stream, pq);
} }
int nghttp2_stream_check_deferred_data(nghttp2_stream *stream) int nghttp2_stream_check_deferred_data(nghttp2_stream *stream)