Skip to content

Commit 35b553d

Browse files
author
mdounin
committed
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). git-svn-id: svn://svn.nginx.org/nginx/trunk@4621 73f98a42-aea0-e011-b76d-00259023448c
1 parent 3b6c017 commit 35b553d

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Diff for: src/http/ngx_http_request.c

+1
Original file line numberDiff line numberDiff line change
@@ -1933,6 +1933,7 @@ ngx_http_finalize_request(ngx_http_request_t *r, ngx_int_t rc)
19331933

19341934
if (rc == NGX_OK && r->filter_finalize) {
19351935
c->error = 1;
1936+
ngx_http_finalize_connection(r);
19361937
return;
19371938
}
19381939

0 commit comments

Comments
 (0)