From 5bf12b24f985ffce9a40b9ce5e173d3fce696178 Mon Sep 17 00:00:00 2001 From: Yang Song Date: Thu, 21 Feb 2019 15:12:46 -0500 Subject: [PATCH] Move the parse of session->ob_reg after session->ob_syn. --- lib/nghttp2_session.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/nghttp2_session.c b/lib/nghttp2_session.c index ef4932af..997c7d90 100644 --- a/lib/nghttp2_session.c +++ b/lib/nghttp2_session.c @@ -2349,13 +2349,6 @@ nghttp2_session_pop_next_ob_item(nghttp2_session *session) { 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)) { item = nghttp2_outbound_queue_top(&session->ob_syn); if (item) { @@ -2365,6 +2358,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) { return nghttp2_stream_next_outbound_item(&session->root); }