# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1338805620 0
# Node ID f12d474f0d5e9a1312ca86e9e02b691475af847b
# Parent  c92289afb5bea7ab7aaa0841cc23b7da6b91028c
Merge of r4612: proper subrequest handling in various modules.

diff -r c92289afb5be -r f12d474f0d5e src/http/modules/ngx_http_flv_module.c
--- a/src/http/modules/ngx_http_flv_module.c	Mon Jun 04 10:15:55 2012 +0000
+++ b/src/http/modules/ngx_http_flv_module.c	Mon Jun 04 10:27:00 2012 +0000
@@ -235,7 +235,7 @@
     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 -r c92289afb5be -r f12d474f0d5e src/http/modules/ngx_http_gzip_static_module.c
--- a/src/http/modules/ngx_http_gzip_static_module.c	Mon Jun 04 10:15:55 2012 +0000
+++ b/src/http/modules/ngx_http_gzip_static_module.c	Mon Jun 04 10:27:00 2012 +0000
@@ -245,7 +245,7 @@
     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 -r c92289afb5be -r f12d474f0d5e src/http/modules/ngx_http_mp4_module.c
--- a/src/http/modules/ngx_http_mp4_module.c	Mon Jun 04 10:15:55 2012 +0000
+++ b/src/http/modules/ngx_http_mp4_module.c	Mon Jun 04 10:27:00 2012 +0000
@@ -616,7 +616,7 @@
     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 -r c92289afb5be -r f12d474f0d5e src/http/modules/ngx_http_stub_status_module.c
--- a/src/http/modules/ngx_http_stub_status_module.c	Mon Jun 04 10:15:55 2012 +0000
+++ b/src/http/modules/ngx_http_stub_status_module.c	Mon Jun 04 10:27:00 2012 +0000
@@ -121,7 +121,7 @@
     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);