[nginx] svn commit: r4641 - trunk/src/http

[mdounin at mdounin.ru]

Author: mdounin
Date: 2012-05-17 17:41:40 +0000 (Thu, 17 May 2012)
New Revision: 4641
URL: http://trac.nginx.org/nginx/changeset/4641/nginx

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


Modified:
   trunk/src/http/ngx_http_request.c

Modified: trunk/src/http/ngx_http_request.c
===================================================================
--- trunk/src/http/ngx_http_request.c	2012-05-17 15:12:45 UTC (rev 4640)
+++ trunk/src/http/ngx_http_request.c	2012-05-17 17:41:40 UTC (rev 4641)
@@ -1933,8 +1933,6 @@
 
     if (rc == NGX_OK && r->filter_finalize) {
         c->error = 1;
-        ngx_http_finalize_connection(r);
-        return;
     }
 
     if (rc == NGX_DECLINED) {