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

nghttp2_stream_detach_deferred_data -> nghttp2_stream_resume_deferred_data

This commit is contained in:
Tatsuhiro Tsujikawa 2014-04-02 22:58:06 +09:00
parent ef40879b5f
commit 580a19e097
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nghttp2_session.c
View File

@ -3083,7 +3083,7 @@ static int nghttp2_update_remote_initial_window_size_func
stream->remote_window_size > 0 && stream->remote_window_size > 0 &&
arg->session->remote_window_size > 0) { arg->session->remote_window_size > 0) {
rv = nghttp2_stream_detach_deferred_data(stream, &arg->session->ob_pq); rv = nghttp2_stream_resume_deferred_data(stream, &arg->session->ob_pq);
if(nghttp2_is_fatal(rv)) { if(nghttp2_is_fatal(rv)) {
return rv; return rv;
@ -3576,7 +3576,7 @@ static int nghttp2_push_back_deferred_data_func(nghttp2_map_entry *entry,
if(nghttp2_stream_check_deferred_by_flow_control(stream) && if(nghttp2_stream_check_deferred_by_flow_control(stream) &&
stream->remote_window_size > 0) { stream->remote_window_size > 0) {
rv = nghttp2_stream_detach_deferred_data(stream, &session->ob_pq); rv = nghttp2_stream_resume_deferred_data(stream, &session->ob_pq);
if(nghttp2_is_fatal(rv)) { if(nghttp2_is_fatal(rv)) {
return rv; return rv;
@ -3646,7 +3646,7 @@ static int session_on_stream_window_update_received
session->remote_window_size > 0 && session->remote_window_size > 0 &&
nghttp2_stream_check_deferred_by_flow_control(stream)) { nghttp2_stream_check_deferred_by_flow_control(stream)) {
rv = nghttp2_stream_detach_deferred_data(stream, &session->ob_pq); rv = nghttp2_stream_resume_deferred_data(stream, &session->ob_pq);
if(nghttp2_is_fatal(rv)) { if(nghttp2_is_fatal(rv)) {
return rv; return rv;
@ -5476,7 +5476,7 @@ int nghttp2_session_resume_data(nghttp2_session *session, int32_t stream_id)
return 0; return 0;
} }
rv = nghttp2_stream_detach_deferred_data(stream, &session->ob_pq); rv = nghttp2_stream_resume_deferred_data(stream, &session->ob_pq);
if(nghttp2_is_fatal(rv)) { if(nghttp2_is_fatal(rv)) {
return rv; return rv;

2
lib/nghttp2_stream.c
View File

@ -366,7 +366,7 @@ void nghttp2_stream_defer_data(nghttp2_stream *stream, uint8_t flags)
stream->flags |= flags; stream->flags |= flags;
} }
int nghttp2_stream_detach_deferred_data(nghttp2_stream *stream, int nghttp2_stream_resume_deferred_data(nghttp2_stream *stream,
nghttp2_pq *pq) nghttp2_pq *pq)
{ {
assert(stream->data_item); assert(stream->data_item);

2
lib/nghttp2_stream.h
View File

@ -194,7 +194,7 @@ void nghttp2_stream_defer_data(nghttp2_stream *stream, uint8_t flags);
* NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL are cleared if they are * NGHTTP2_STREAM_FLAG_DEFERRED_FLOW_CONTROL are cleared if they are
* set. * set.
*/ */
int nghttp2_stream_detach_deferred_data(nghttp2_stream *stream, int nghttp2_stream_resume_deferred_data(nghttp2_stream *stream,
nghttp2_pq *pq); nghttp2_pq *pq);
/* /*