Mercurial > hg > nginx-quic
changeset 5028:44025ae9fc67
FastCGI: proper handling of split fastcgi end request.
If fastcgi end request record was split between several network packets,
with fastcgi_keep_conn it was possible that connection was saved in incorrect
state (e.g. with padding bytes not yet read).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 01 Feb 2013 14:41:50 +0000 |
parents | 2ab25df19dc6 |
children | 795722a74254 |
files | src/http/modules/ngx_http_fastcgi_module.c |
diffstat | 1 files changed, 37 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -1701,17 +1701,15 @@ ngx_http_fastcgi_input_filter(ngx_event_ } if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { - f->state = ngx_http_fastcgi_st_padding; - - p->upstream_done = 1; - - if (flcf->keep_conn) { - r->upstream->keepalive = 1; - } ngx_log_debug0(NGX_LOG_DEBUG_HTTP, p->log, 0, "http fastcgi sent end request"); + if (!flcf->keep_conn) { + p->upstream_done = 1; + break; + } + continue; } } @@ -1719,6 +1717,24 @@ ngx_http_fastcgi_input_filter(ngx_event_ if (f->state == ngx_http_fastcgi_st_padding) { + if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { + + if (f->pos + f->padding < f->last) { + p->upstream_done = 1; + break; + } + + if (f->pos + f->padding == f->last) { + p->upstream_done = 1; + r->upstream->keepalive = 1; + break; + } + + f->padding -= f->last - f->pos; + + break; + } + if (f->pos + f->padding < f->last) { f->state = ngx_http_fastcgi_st_version; f->pos += f->padding; @@ -1777,6 +1793,20 @@ ngx_http_fastcgi_input_filter(ngx_event_ continue; } + if (f->type == NGX_HTTP_FASTCGI_END_REQUEST) { + + if (f->pos + f->length <= f->last) { + f->state = ngx_http_fastcgi_st_padding; + f->pos += f->length; + + continue; + } + + f->length -= f->last - f->pos; + + break; + } + /* f->type == NGX_HTTP_FASTCGI_STDOUT */