Mercurial > hg > nginx
changeset 3213:7fc06314c684
fix ngx_http_finalize_request() code after a body has been discarded
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 19 Oct 2009 16:06:57 +0000 |
parents | e67d000b5337 |
children | 798a7f1d3b2f |
files | src/http/ngx_http_request_body.c |
diffstat | 1 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_request_body.c +++ b/src/http/ngx_http_request_body.c @@ -503,7 +503,7 @@ ngx_http_read_discarded_request_body_han if (rev->timedout) { c->timedout = 1; c->error = 1; - ngx_http_finalize_request(r, 0); + ngx_http_finalize_request(r, NGX_ERROR); return; } @@ -513,7 +513,7 @@ ngx_http_read_discarded_request_body_han if (timer <= 0) { r->discard_body = 0; r->lingering_close = 0; - ngx_http_finalize_request(r, 0); + ngx_http_finalize_request(r, NGX_ERROR); return; } @@ -524,14 +524,9 @@ ngx_http_read_discarded_request_body_han rc = ngx_http_read_discarded_request_body(r); if (rc == NGX_OK) { - r->discard_body = 0; r->lingering_close = 0; - - if (r->done) { - ngx_http_finalize_request(r, 0); - } - + ngx_http_finalize_request(r, NGX_DONE); return; } @@ -539,7 +534,7 @@ ngx_http_read_discarded_request_body_han if (ngx_handle_read_event(rev, 0) != NGX_OK) { c->error = 1; - ngx_http_finalize_request(r, rc); + ngx_http_finalize_request(r, NGX_ERROR); return; }