From: Maxim Dounin <mdounin@mdounin.ru>
Date: Thu, 17 May 2012 17:41:40 +0000 (+0000)
Subject: Fixed segfault with filter_finalize introduced in r4621 (1.3.0).
X-Git-Tag: release-1.3.1~22
X-Git-Url: http://git.kaiwu.me/sitemap.xml?a=commitdiff_plain;h=d2143f11cbb3e1502e75d2e771aed1e79be7d612;p=nginx.git

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.
---

diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index fa58dd99b..06f89d648 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1933,8 +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;
-        ngx_http_finalize_connection(r);
-        return;
     }
 
     if (rc == NGX_DECLINED) {