[nginx] SPDY: refactored ngx_http_spdy_state_read_data().

Valentin Bartenev vbart at nginx.com
Mon Apr 7 15:29:27 UTC 2014


details:   http://hg.nginx.org/nginx/rev/d2ac5cf4056d
branches:  
changeset: 5642:d2ac5cf4056d
user:      Valentin Bartenev <vbart at nginx.com>
date:      Mon Apr 07 19:27:56 2014 +0400
description:
SPDY: refactored ngx_http_spdy_state_read_data().

There's no more need in a separate indicator of frame completeness
after d74889fbf06d.

diffstat:

 src/http/ngx_http_spdy.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (34 lines):

diff -r 0aeb6f63d242 -r d2ac5cf4056d src/http/ngx_http_spdy.c
--- a/src/http/ngx_http_spdy.c	Mon Apr 07 19:27:56 2014 +0400
+++ b/src/http/ngx_http_spdy.c	Mon Apr 07 19:27:56 2014 +0400
@@ -1498,7 +1498,6 @@ ngx_http_spdy_state_read_data(ngx_http_s
     ssize_t                    n;
     ngx_buf_t                 *buf;
     ngx_int_t                  rc;
-    ngx_uint_t                 complete;
     ngx_temp_file_t           *tf;
     ngx_http_request_t        *r;
     ngx_http_spdy_stream_t    *stream;
@@ -1523,12 +1522,8 @@ ngx_http_spdy_state_read_data(ngx_http_s
 
     size = end - pos;
 
-    if (size >= sc->length) {
+    if (size > sc->length) {
         size = sc->length;
-        complete = 1;
-
-    } else {
-        complete = 0;
     }
 
     r = stream->request;
@@ -1600,7 +1595,7 @@ ngx_http_spdy_state_read_data(ngx_http_s
         r->request_length += size;
     }
 
-    if (!complete) {
+    if (sc->length) {
         return ngx_http_spdy_state_save(sc, pos, end,
                                         ngx_http_spdy_state_read_data);
     }



More information about the nginx-devel mailing list