Mercurial > hg > nginx

comparison src/http/ngx_http_spdy.c @ 5509:877a7bd72070

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SPDY: better name for flag that indicates incomplete frame state. No functional changes.
author Valentin Bartenev <vbart@nginx.com>
date Tue, 14 Jan 2014 16:24:45 +0400
parents 9053fdcea4b7
children 3ff29c30effb
comparison
equal deleted inserted replaced
5508:9053fdcea4b7 5509:877a7bd72070
344 344
345 if (n == NGX_AGAIN) { 345 if (n == NGX_AGAIN) {
346 break; 346 break;
347 } 347 }
348 348
349 if (n == 0 && (sc->waiting || sc->processing)) { 349 if (n == 0 && (sc->incomplete || sc->processing)) {
350 ngx_log_error(NGX_LOG_INFO, c->log, 0, 350 ngx_log_error(NGX_LOG_INFO, c->log, 0,
351 "client closed prematurely connection"); 351 "client closed prematurely connection");
352 } 352 }
353 353
354 if (n == 0 || n == NGX_ERROR) { 354 if (n == 0 || n == NGX_ERROR) {
358 } 358 }
359 359
360 end += n; 360 end += n;
361 361
362 sc->buffer_used = 0; 362 sc->buffer_used = 0;
363 sc->waiting = 0; 363 sc->incomplete = 0;
364 364
365 do { 365 do {
366 p = sc->handler(sc, p, end); 366 p = sc->handler(sc, p, end);
367 367
368 if (p == NULL) { 368 if (p == NULL) {
565 return; 565 return;
566 } 566 }
567 567
568 sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx, 568 sscf = ngx_http_get_module_srv_conf(sc->http_connection->conf_ctx,
569 ngx_http_spdy_module); 569 ngx_http_spdy_module);
570 if (sc->waiting) { 570 if (sc->incomplete) {
571 ngx_add_timer(c->read, sscf->recv_timeout); 571 ngx_add_timer(c->read, sscf->recv_timeout);
572 return; 572 return;
573 } 573 }
574 574
575 if (ngx_terminate || ngx_exiting) { 575 if (ngx_terminate || ngx_exiting) {
1487 1487
1488 ngx_memcpy(sc->buffer, pos, NGX_SPDY_STATE_BUFFER_SIZE); 1488 ngx_memcpy(sc->buffer, pos, NGX_SPDY_STATE_BUFFER_SIZE);
1489 1489
1490 sc->buffer_used = end - pos; 1490 sc->buffer_used = end - pos;
1491 sc->handler = handler; 1491 sc->handler = handler;
1492 sc->waiting = 1; 1492 sc->incomplete = 1;
1493 1493
1494 return end; 1494 return end;
1495 } 1495 }
1496 1496
1497 1497