From 6ddb578b2223f5a4b4fb7f555be8115a946471d0 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Tue, 14 Jan 2014 16:24:45 +0400 Subject: [PATCH] SPDY: better name for flag that indicates incomplete frame state. No functional changes. --- src/http/ngx_http_spdy.c | 8 ++++---- src/http/ngx_http_spdy.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/http/ngx_http_spdy.c b/src/http/ngx_http_spdy.c index 034d82de8..f68b82ff4 100644 --- a/src/http/ngx_http_spdy.c +++ b/src/http/ngx_http_spdy.c @@ -346,7 +346,7 @@ ngx_http_spdy_read_handler(ngx_event_t *rev) break; } - if (n == 0 && (sc->waiting || sc->processing)) { + if (n == 0 && (sc->incomplete || sc->processing)) { ngx_log_error(NGX_LOG_INFO, c->log, 0, "client closed prematurely connection"); } @@ -360,7 +360,7 @@ ngx_http_spdy_read_handler(ngx_event_t *rev) end += n; sc->buffer_used = 0; - sc->waiting = 0; + sc->incomplete = 0; do { p = sc->handler(sc, p, end); @@ -567,7 +567,7 @@ ngx_http_spdy_handle_connection(ngx_http_spdy_connection_t *sc) sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx, ngx_http_spdy_module); - if (sc->waiting) { + if (sc->incomplete) { ngx_add_timer(c->read, sscf->recv_timeout); return; } @@ -1489,7 +1489,7 @@ ngx_http_spdy_state_save(ngx_http_spdy_connection_t *sc, sc->buffer_used = end - pos; sc->handler = handler; - sc->waiting = 1; + sc->incomplete = 1; return end; } diff --git a/src/http/ngx_http_spdy.h b/src/http/ngx_http_spdy.h index d763c38bf..d294a665e 100644 --- a/src/http/ngx_http_spdy.h +++ b/src/http/ngx_http_spdy.h @@ -107,7 +107,7 @@ struct ngx_http_spdy_connection_s { ngx_uint_t last_sid; unsigned blocked:1; - unsigned waiting:1; /* FIXME better name */ + unsigned incomplete:1; };