From 228d4927f041ad3e060ae79bbcacfc83d01e8edd Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 4 Jun 2012 11:15:46 +0000 Subject: Merge of r4621, r4641: filter_finalize fixes. *) Fixed possible request hang with filter finalization. With r->filter_finalize set the ngx_http_finalize_connection() wasn't called from ngx_http_finalize_request() called with NGX_OK, resulting in r->main->count not being decremented, thus causing request hang in some rare situations. Patch by Yichun Zhang (agentzh). *) Fixed segfault with filter_finalize introduced in r4621 (1.3.0). See the following thread for more details: http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002190.html --- src/http/ngx_http_request.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/http/ngx_http_request.c') diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index 59d4d4ae6..06f89d648 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1933,7 +1933,6 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc) if (rc == NGX_OK && r->filter_finalize) { c->error = 1; - return; } if (rc == NGX_DECLINED) { -- cgit v1.2.3