commit e302ed6fc3ea48f2ccb5bc410d6306522d4f7497
author Maxim Dounin <mdounin@mdounin.ru> Mon May 14 09:48:05 2012 +0000
committer Maxim Dounin <mdounin@mdounin.ru> Mon May 14 09:48:05 2012 +0000
tree c0cb832919dc5d5d0910aad61f534bf5584e4bee
parent 7d863c0181064b08fa6b3816522551084fd91af5

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.

See here for more details:
http://mailman.nginx.org/pipermail/nginx-devel/2012-May/002190.html

Patch by Yichun Zhang (agentzh).

src/http/ngx_http_request.c

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index 59d4d4a..fa58dd9 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1933,6 +1933,7 @@
 
     if (rc == NGX_OK && r->filter_finalize) {
         c->error = 1;
+        ngx_http_finalize_connection(r);
         return;
     }