SPDY: better name for queued frames counter.

No functional changes.

diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
index 5693ea959196449f261c7d684c162dca33c2461a..034d82de8681329355d25d986651f5476f4b03f3 100644 (file)
--- a/src/http/ngx_http_spdy.c
+++ b/src/http/ngx_http_spdy.c
@@ -2861,9 +2861,9 @@ ngx_http_spdy_finalize_connection(ngx_http_spdy_connection_t *sc,
 
             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;

diff --git a/src/http/ngx_http_spdy.h b/src/http/ngx_http_spdy.h
index c011a3d6fa642b8e85ba4fc94a894b7cc2408d97..d763c38bfcf815505e7a0288a31fc453f7b2e9cd 100644 (file)
--- a/src/http/ngx_http_spdy.h
+++ b/src/http/ngx_http_spdy.h
@@ -119,7 +119,8 @@ struct ngx_http_spdy_stream_s {
     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;
 

diff --git a/src/http/ngx_http_spdy_filter_module.c b/src/http/ngx_http_spdy_filter_module.c
index 6ca82e8133e90678c61becdd07165538e4f49e57..23067407ed69ca3c0ac291431dbf363872c404b8 100644 (file)
--- a/src/http/ngx_http_spdy_filter_module.c
+++ b/src/http/ngx_http_spdy_filter_module.c
@@ -607,7 +607,7 @@ ngx_http_spdy_header_filter(ngx_http_request_t *r)
     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 @@ ngx_http_spdy_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     if (in == NULL || r->header_only) {
 
-        if (stream->waiting) {
+        if (stream->queued) {
             return NGX_AGAIN;
         }
 
@@ -695,7 +695,7 @@ ngx_http_spdy_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 
     ngx_http_spdy_queue_frame(stream->connection, frame);
 
-    stream->waiting++;
+    stream->queued++;
 
     r->main->blocked++;
 
@@ -800,7 +800,7 @@ ngx_http_spdy_filter_send(ngx_connection_t *fc, ngx_http_spdy_stream_t *stream)
 
     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 @@ ngx_http_spdy_handle_frame(ngx_http_spdy_stream_t *stream,
     frame->free = stream->free_frames;
     stream->free_frames = frame;
 
-    stream->waiting--;
+    stream->queued--;
 }
 
 
@@ -965,7 +965,7 @@ ngx_http_spdy_filter_cleanup(void *data)
     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 @@ ngx_http_spdy_filter_cleanup(void *data)
 
         if (frame->stream == stream && !frame->blocked) {
 
-            stream->waiting--;
+            stream->queued--;
             r->blocked--;
 
             *fn = frame->next;