diff options
| author | Valentin Bartenev <vbart@nginx.com> | 2014-04-30 20:34:20 +0400 |
|---|---|---|
| committer | Valentin Bartenev <vbart@nginx.com> | 2014-04-30 20:34:20 +0400 |
| commit | 57e5c3e86ddfd99f4bca5be18528f9613a03023a (patch) | |
| tree | 8ae8d6d836dbb9d8e53edaa3a4858012661fdde5 | |
| parent | d04a714a6de16bc0358efe7241365eee53fedfb5 (diff) | |
| download | nginx-57e5c3e86ddfd99f4bca5be18528f9613a03023a.tar.gz nginx-57e5c3e86ddfd99f4bca5be18528f9613a03023a.zip | |
SPDY: refactored ngx_http_spdy_state_headers().
This change is similar to d2ac5cf4056d. Special flag of completeness looks
surplus when there is also a counter of frame bytes left.
| -rw-r--r-- | src/http/ngx_http_spdy.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c index b754c4cc0..8bce18ebb 100644 --- a/src/http/ngx_http_spdy.c +++ b/src/http/ngx_http_spdy.c @@ -1009,7 +1009,6 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos, size_t size; ngx_buf_t *buf; ngx_int_t rc; - ngx_uint_t complete; ngx_http_request_t *r; size = end - pos; @@ -1019,12 +1018,8 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos, ngx_http_spdy_state_headers); } - if (size >= sc->length) { + if (size > sc->length) { size = sc->length; - complete = 1; - - } else { - complete = 0; } r = sc->stream->request; @@ -1089,7 +1084,7 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos, if (buf->last - buf->pos < NGX_SPDY_NV_NUM_SIZE) { - if (complete) { + if (sc->length == 0) { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "premature end of spdy header block"); @@ -1181,7 +1176,7 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos, continue; } - if (complete) { + if (sc->length == 0) { ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "premature end of spdy header block"); @@ -1225,7 +1220,7 @@ ngx_http_spdy_state_headers(ngx_http_spdy_connection_t *sc, u_char *pos, return ngx_http_spdy_state_headers_error(sc, pos, end); } - if (!complete) { + if (sc->length) { return ngx_http_spdy_state_save(sc, pos, end, ngx_http_spdy_state_headers); } |