Merge 5bf12b24f9
into cb11cfcd2c
This commit is contained in:
commit
78bc6c3d21
|
@ -2717,13 +2717,6 @@ nghttp2_session_pop_next_ob_item(nghttp2_session *session) {
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
item = nghttp2_outbound_queue_top(&session->ob_reg);
|
|
||||||
if (item) {
|
|
||||||
nghttp2_outbound_queue_pop(&session->ob_reg);
|
|
||||||
item->queued = 0;
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!session_is_outgoing_concurrent_streams_max(session)) {
|
if (!session_is_outgoing_concurrent_streams_max(session)) {
|
||||||
item = nghttp2_outbound_queue_top(&session->ob_syn);
|
item = nghttp2_outbound_queue_top(&session->ob_syn);
|
||||||
if (item) {
|
if (item) {
|
||||||
|
@ -2733,6 +2726,13 @@ nghttp2_session_pop_next_ob_item(nghttp2_session *session) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
item = nghttp2_outbound_queue_top(&session->ob_reg);
|
||||||
|
if (item) {
|
||||||
|
nghttp2_outbound_queue_pop(&session->ob_reg);
|
||||||
|
item->queued = 0;
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
if (session->remote_window_size > 0) {
|
if (session->remote_window_size > 0) {
|
||||||
item = nghttp2_stream_next_outbound_item(&session->root);
|
item = nghttp2_stream_next_outbound_item(&session->root);
|
||||||
if (item) {
|
if (item) {
|
||||||
|
|
Loading…
Reference in New Issue