[nginx] svn commit: r4667 - in branches/stable-1.2: . src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-06-04 11:15:46 +0000 (Mon, 04 Jun 2012)
New Revision: 4667
URL: http://trac.nginx.org/nginx/changeset/4667/nginx

Log:
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


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/http/ngx_http_request.c

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2012-06-04 11:10:36 UTC (rev 4666)
+++ branches/stable-1.2	2012-06-04 11:15:46 UTC (rev 4667)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4613,4615-4620
+/trunk:4611-4613,4615-4621,4641
\ No newline at end of property
Modified: branches/stable-1.2/src/http/ngx_http_request.c
===================================================================
--- branches/stable-1.2/src/http/ngx_http_request.c	2012-06-04 11:10:36 UTC (rev 4666)
+++ branches/stable-1.2/src/http/ngx_http_request.c	2012-06-04 11:15:46 UTC (rev 4667)
@@ -1933,7 +1933,6 @@
 
     if (rc == NGX_OK && r->filter_finalize) {
         c->error = 1;
-        return;
     }
 
     if (rc == NGX_DECLINED) {