diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-05-17 17:41:40 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-05-17 17:41:40 +0000 |
| commit | d2143f11cbb3e1502e75d2e771aed1e79be7d612 (patch) | |
| tree | a3f55788909eb40465539e896aabf1157d6a3c08 /src/http/ngx_http_request.c | |
| parent | 430ab81a7277106fe27278782d05fdf8f69bfc4a (diff) | |
| download | nginx-d2143f11cbb3e1502e75d2e771aed1e79be7d612.tar.gz nginx-d2143f11cbb3e1502e75d2e771aed1e79be7d612.zip | |
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.
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 2 |
1 files changed, 0 insertions, 2 deletions
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) { |