Mercurial > hg > nginx

changeset 4640:07f028df3879

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed segfault with filter_finalize introduced in r4621 (1.3.0). Example configuration to reproduce: location /image/ { error_page 415 = /zero; image_filter crop 100 100; proxy_pass http://127.0.0.1:8080; proxy_store on; } location /zero { return 204; } The problem appeared if upstream returned (big enough) non-image file, causing 415 to be generated by image filter.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 17 May 2012 17:41:40 +0000
parents 944839adc406
children 045bb3ef3ffc
files src/http/ngx_http_request.c
diffstat 1 files changed, 0 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1933,8 +1933,6 @@ ngx_http_finalize_request(ngx_http_reque
 
     if (rc == NGX_OK && r->filter_finalize) {
         c->error = 1;
-        ngx_http_finalize_connection(r);
-        return;
     }
 
     if (rc == NGX_DECLINED) {