diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2014-02-12 21:02:29 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2014-02-12 21:02:29 +0400 |
| commit | b20af091b7b656ad2d991ee1f8b81c72a1743cfa (patch) | |
| tree | fde6e268e800834e461733538d013eb791411a96 /src | |
| parent | 60d508ceb9c5ad867d33b819c9dfbdf05b9eef4b (diff) | |
| download | nginx-b20af091b7b656ad2d991ee1f8b81c72a1743cfa.tar.gz nginx-b20af091b7b656ad2d991ee1f8b81c72a1743cfa.tar.bz2 | |
SPDY: fixed reversed priority order in window waiting queue.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_spdy.h | 3 | ||||
| -rw-r--r-- | src/http/ngx_http_spdy_filter_module.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/http/ngx_http_spdy.h b/src/http/ngx_http_spdy.h index b98b4d85a..55aceda89 100644 --- 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_connection_t *sc, for (out = &sc->last_out; *out; out = &(*out)->next) { + /* + * NB: higher values represent lower priorities. + */ if (frame->priority >= (*out)->priority) { break; } diff --git a/src/http/ngx_http_spdy_filter_module.c b/src/http/ngx_http_spdy_filter_module.c index 8a3f0a3c8..92c760243 100644 --- 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_spdy_connection_t *sc, { 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; } } |