changeset 5576:2bc609a4b516

SPDY: fixed reversed priority order in window waiting queue.
author Valentin Bartenev <vbart@nginx.com>
date Wed, 12 Feb 2014 21:02:29 +0400
parents d15822784cf9
children bfe536716dbf
files src/http/ngx_http_spdy.h src/http/ngx_http_spdy_filter_module.c
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_spdy.h
+++ b/src/http/ngx_http_spdy.h
@@ -174,6 +174,9 @@ ngx_http_spdy_queue_frame(ngx_http_spdy_
 
     for (out = &sc->last_out; *out; out = &(*out)->next)
     {
+        /*
+         * NB: higher values represent lower priorities.
+         */
         if (frame->priority >= (*out)->priority) {
             break;
         }
--- a/src/http/ngx_http_spdy_filter_module.c
+++ b/src/http/ngx_http_spdy_filter_module.c
@@ -967,7 +967,10 @@ ngx_http_spdy_waiting_queue(ngx_http_spd
     {
         s = ngx_queue_data(q, ngx_http_spdy_stream_t, queue);
 
-        if (s->priority >= stream->priority) {
+        /*
+         * NB: higher values represent lower priorities.
+         */
+        if (stream->priority >= s->priority) {
             break;
         }
     }