From eeec229e3e5c1278dd98d48d96cd6d7063da3974 Mon Sep 17 00:00:00 2001 From: Andrey Belov Date: Thu, 26 Apr 2012 13:06:27 +0000 Subject: [PATCH] Allows particular modules to handle subrequests properly. --- src/http/modules/ngx_http_flv_module.c | 2 +- src/http/modules/ngx_http_gzip_static_module.c | 2 +- src/http/modules/ngx_http_mp4_module.c | 2 +- src/http/modules/ngx_http_stub_status_module.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/http/modules/ngx_http_flv_module.c b/src/http/modules/ngx_http_flv_module.c index 719a01124..03a746803 100644 --- a/src/http/modules/ngx_http_flv_module.c +++ b/src/http/modules/ngx_http_flv_module.c @@ -235,7 +235,7 @@ ngx_http_flv_handler(ngx_http_request_t *r) b->file_last = of.size; b->in_file = b->file_last ? 1: 0; - b->last_buf = 1; + b->last_buf = (r == r->main) ? 1 : 0; b->last_in_chain = 1; b->file->fd = of.fd; diff --git a/src/http/modules/ngx_http_gzip_static_module.c b/src/http/modules/ngx_http_gzip_static_module.c index 46ce8f3f3..b0183e0aa 100644 --- a/src/http/modules/ngx_http_gzip_static_module.c +++ b/src/http/modules/ngx_http_gzip_static_module.c @@ -245,7 +245,7 @@ ngx_http_gzip_static_handler(ngx_http_request_t *r) b->file_last = of.size; b->in_file = b->file_last ? 1 : 0; - b->last_buf = 1; + b->last_buf = (r == r->main) ? 1 : 0; b->last_in_chain = 1; b->file->fd = of.fd; diff --git a/src/http/modules/ngx_http_mp4_module.c b/src/http/modules/ngx_http_mp4_module.c index 433e118a2..2c8cfd171 100644 --- a/src/http/modules/ngx_http_mp4_module.c +++ b/src/http/modules/ngx_http_mp4_module.c @@ -616,7 +616,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r) b->file_last = of.size; b->in_file = b->file_last ? 1 : 0; - b->last_buf = 1; + b->last_buf = (r == r->main) ? 1 : 0; b->last_in_chain = 1; b->file->fd = of.fd; diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c index f78086981..96abe928a 100644 --- a/src/http/modules/ngx_http_stub_status_module.c +++ b/src/http/modules/ngx_http_stub_status_module.c @@ -121,7 +121,7 @@ static ngx_int_t ngx_http_status_handler(ngx_http_request_t *r) r->headers_out.status = NGX_HTTP_OK; r->headers_out.content_length_n = b->last - b->pos; - b->last_buf = 1; + b->last_buf = (r == r->main) ? 1 : 0; rc = ngx_http_send_header(r);