]> git.kaiwu.me - nginx.git/commitdiff
SPDY: refactored ngx_http_spdy_state_read_data().
authorValentin Bartenev <vbart@nginx.com>
Mon, 7 Apr 2014 15:27:56 +0000 (19:27 +0400)
committerValentin Bartenev <vbart@nginx.com>
Mon, 7 Apr 2014 15:27:56 +0000 (19:27 +0400)
There's no more need in a separate indicator of frame completeness
after d74889fbf06d.

src/http/ngx_http_spdy.c

index d821475d2bcdb57a2fc2b2882336ceaa7a20c635..9e4ac3476775a2513b8fc2b3779cbcdc2fe95f86 100644 (file)
@@ -1498,7 +1498,6 @@ ngx_http_spdy_state_read_data(ngx_http_spdy_connection_t *sc, u_char *pos,
     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_spdy_connection_t *sc, u_char *pos,
 
     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_spdy_connection_t *sc, u_char *pos,
         r->request_length += size;
     }
 
-    if (!complete) {
+    if (sc->length) {
         return ngx_http_spdy_state_save(sc, pos, end,
                                         ngx_http_spdy_state_read_data);
     }