Mercurial > hg > nginx

changeset 5642:d2ac5cf4056d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SPDY: refactored ngx_http_spdy_state_read_data(). There's no more need in a separate indicator of frame completeness after d74889fbf06d.
author Valentin Bartenev <vbart@nginx.com>
date Mon, 07 Apr 2014 19:27:56 +0400
parents 0aeb6f63d242
children 436f3605195a
files src/http/ngx_http_spdy.c
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_spdy.c
+++ b/src/http/ngx_http_spdy.c
@@ -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);
     }