Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Bartenev <vbart@nginx.com>2014-04-07 19:27:56 +0400
committerValentin Bartenev <vbart@nginx.com>2014-04-07 19:27:56 +0400
commit108e4d94e4585085f3244f50905d772d089bcb70 (patch)
tree4d81693fc47959b2bad2818a58da8fc561c2d321
parentb2cd52067348aad0f751e654ed7f42f0a29b418d (diff)
SPDY: refactored ngx_http_spdy_state_read_data().
There's no more need in a separate indicator of frame completeness after d74889fbf06d.
-rw-r--r--src/http/ngx_http_spdy.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c
index d821475d2..9e4ac3476 100644
--- 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_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);
}