commit 00944562acc7b9bd1c70b013d09658c4f8ee5cf2
author Valentin Bartenev <vbart@nginx.com> Tue Jan 14 16:24:45 2014 +0400
committer Valentin Bartenev <vbart@nginx.com> Tue Jan 14 16:24:45 2014 +0400
tree 4e44a36c6f0b89d8eeff61d6e8c90c79d4fc3477
parent df1d8f78ac6ff7431291e0f56549ed3085f1df6f

SPDY: better name for queued frames counter.

No functional changes.

src/http/ngx_http_spdy.c

diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
index 5693ea9..034d82d 100644
--- a/src/http/ngx_http_spdy.c
+++ b/src/http/ngx_http_spdy.c
@@ -2861,9 +2861,9 @@
 
             fc->error = 1;
 
-            if (stream->waiting) {
-                r->blocked -= stream->waiting;
-                stream->waiting = 0;
+            if (stream->queued) {
+                r->blocked -= stream->queued;
+                stream->queued = 0;
 
                 ev = fc->write;
                 ev->delayed = 0;

src/http/ngx_http_spdy.h

diff --git a/src/http/ngx_http_spdy.h b/src/http/ngx_http_spdy.h
index c011a3d..d763c38 100644
--- a/src/http/ngx_http_spdy.h
+++ b/src/http/ngx_http_spdy.h
@@ -119,7 +119,8 @@
     ngx_http_spdy_stream_t          *next;
 
     ngx_uint_t                       header_buffers;
-    ngx_uint_t                       waiting;
+    ngx_uint_t                       queued;
+
     ngx_http_spdy_out_frame_t       *free_frames;
     ngx_chain_t                     *free_data_headers;
 

src/http/ngx_http_spdy_filter_module.c

diff --git a/src/http/ngx_http_spdy_filter_module.c b/src/http/ngx_http_spdy_filter_module.c
index 6ca82e8..2306740 100644
--- a/src/http/ngx_http_spdy_filter_module.c
+++ b/src/http/ngx_http_spdy_filter_module.c
@@ -607,7 +607,7 @@
     cln->handler = ngx_http_spdy_filter_cleanup;
     cln->data = stream;
 
-    stream->waiting = 1;
+    stream->queued = 1;
 
     return ngx_http_spdy_filter_send(c, stream);
 }
@@ -633,7 +633,7 @@
 
     if (in == NULL || r->header_only) {
 
-        if (stream->waiting) {
+        if (stream->queued) {
             return NGX_AGAIN;
         }
 
@@ -695,7 +695,7 @@
 
     ngx_http_spdy_queue_frame(stream->connection, frame);
 
-    stream->waiting++;
+    stream->queued++;
 
     r->main->blocked++;
 
@@ -800,7 +800,7 @@
 
     stream->blocked = 0;
 
-    if (stream->waiting) {
+    if (stream->queued) {
         fc->buffered |= NGX_SPDY_WRITE_BUFFERED;
         fc->write->delayed = 1;
         return NGX_AGAIN;
@@ -932,7 +932,7 @@
     frame->free = stream->free_frames;
     stream->free_frames = frame;
 
-    stream->waiting--;
+    stream->queued--;
 }
 
 
@@ -965,7 +965,7 @@
     ngx_http_request_t         *r;
     ngx_http_spdy_out_frame_t  *frame, **fn;
 
-    if (stream->waiting == 0) {
+    if (stream->queued == 0) {
         return;
     }
 
@@ -982,7 +982,7 @@
 
         if (frame->stream == stream && !frame->blocked) {
 
-            stream->waiting--;
+            stream->queued--;
             r->blocked--;
 
             *fn = frame->next;